Also use GL_RENDERER to determine vendorID

~10% or more Linux users* do not have AMD/ATI in the GL_VENDOR, only in GL_RENDERER. Our heuristics only checked GL_VENDOR, so this CL adds GL_RENDERER to the string being checked to find the vendor ID. (*According to https://feedback.wildfiregames.com/report/opengl/feature/GL_VENDOR) Bug: angleproject:4204 Change-Id: Ie89080b4431fdf02a4ca09709973ea3f271a3e84 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1953486Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>

Also use GL_RENDERER to determine vendorID
63c15519 · Jonah Ryan-Davis · Commit Bot · b92ec244 · 63c15519
Commit 63c15519 authored Dec 05, 2019 by Jonah Ryan-Davis Committed by Commit Bot Dec 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +9 -5

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -38,11 +38,11 @@ namespace rx
 VendorID GetVendorID(const FunctionsGL *functions)
 {
    std::string nativeVendorString(reinterpret_cast<const char *>(functions->getString(GL_VENDOR)));
-    if (nativeVendorString.find("Intel") != std::string::npos)
-    {
-        return VENDOR_ID_INTEL;
-    }
-    else if (nativeVendorString.find("NVIDIA") != std::string::npos)
+    // Concatenate GL_RENDERER to the string being checked because some vendors put their names in
+    // GL_RENDERER
+    nativeVendorString +=
+        " " + std::string(reinterpret_cast<const char *>(functions->getString(GL_RENDERER)));
+    if (nativeVendorString.find("NVIDIA") != std::string::npos)
    {
        return VENDOR_ID_NVIDIA;
    }
@@ -55,6 +55,10 @@ VendorID GetVendorID(const FunctionsGL *functions)
    {
        return VENDOR_ID_QUALCOMM;
    }
+    else if (nativeVendorString.find("Intel") != std::string::npos)
+    {
+        return VENDOR_ID_INTEL;
+    }
    else
    {
        return VENDOR_ID_UNKNOWN;