NVIDIA Shield workaround for IsNVIDIA() detection

NVIDIA Shield do not implement Vulkan, which is used to populate vendor IDs in SystemInfo. The vendorIDs are used to check IsNVIDIA(). This CL adds a workaround so IsNVIDIA() returns true for NVIDIA Shield. Bug: angleproject:3541 Change-Id: Ib36dd376207163acfc8d3a0e341f07a7d6aa3122 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1663080 Commit-Queue: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

NVIDIA Shield workaround for IsNVIDIA() detection
32d718f3 · Jonah Ryan-Davis · Commit Bot · f9686af0 · 32d718f3 · 32d718f3
Commit 32d718f3 authored Jun 18, 2019 by Jonah Ryan-Davis Committed by Commit Bot Jun 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

angle_test_instantiate.cpp src/tests/test_utils/angle_test_instantiate.cpp +12 -0

angle_test_instantiate.h src/tests/test_utils/angle_test_instantiate.h +1 -0

No files found.
--- a/src/tests/test_utils/angle_test_instantiate.cpp
+++ b/src/tests/test_utils/angle_test_instantiate.cpp
@@ -185,6 +185,11 @@ bool IsNexus6P()
    return IsAndroidDevice("Nexus 6P");
 }
+bool IsNexus9()
+{
+    return IsAndroidDevice("Nexus 9");
+}
 bool IsPixelXL()
 {
    return IsAndroidDevice("Pixel XL");
@@ -212,6 +217,13 @@ bool IsAMD()
 bool IsNVIDIA()
 {
+#if defined(ANGLE_PLATFORM_ANDROID)
+    // NVIDIA Shield cannot detect vendor ID (http://anglebug.com/3541)
+    if (IsNVIDIAShield())
+    {
+        return true;
+    }
+#endif
    return HasSystemVendorID(kVendorID_NVIDIA);
 }

--- a/src/tests/test_utils/angle_test_instantiate.h
+++ b/src/tests/test_utils/angle_test_instantiate.h
@@ -28,6 +28,7 @@ bool IsFuchsia();
 // Android devices
 bool IsNexus5X();
 bool IsNexus6P();
+bool IsNexus9();
 bool IsPixelXL();
 bool IsPixel2();
 bool IsNVIDIAShield();