Skip swiftshader tests based on active GPU

src/tests/test_utils/ANGLETest.h

@@ -334,8 +334,8 @@ class ANGLETestBase
 
     bool isSwiftshader() const
     {
-        return mCurrentParams->eglParameters.deviceType ==
-               EGL_PLATFORM_ANGLE_DEVICE_TYPE_SWIFTSHADER_ANGLE;
+        // Renderer might be swiftshader even if local swiftshader not used.
+        return mCurrentParams->isSwiftshader() || angle::IsSwiftshaderDevice();
     }
 
   protected:

src/tests/test_utils/angle_test_instantiate.cpp

@@ -109,15 +109,29 @@ bool IsAndroidDevice(const std::string &deviceName)
     return false;
 }
 
-bool HasSystemVendorID(VendorID vendorID)
+GPUDeviceInfo *GetActiveGPUDeviceInfo()
 {
     SystemInfo *systemInfo = GetTestSystemInfo();
     // Unfortunately sometimes GPU info collection can fail.
     if (systemInfo->gpus.empty())
     {
-        return false;
+        return nullptr;
     }
-    return systemInfo->gpus[systemInfo->activeGPUIndex].vendorId == vendorID;
+    return &systemInfo->gpus[systemInfo->activeGPUIndex];
+}
+
+bool HasSystemVendorID(VendorID vendorID)
+{
+    GPUDeviceInfo *gpuInfo = GetActiveGPUDeviceInfo();
+
+    return gpuInfo && gpuInfo->vendorId == vendorID;
+}
+
+bool HasSystemDeviceID(VendorID vendorID, DeviceID deviceID)
+{
+    GPUDeviceInfo *gpuInfo = GetActiveGPUDeviceInfo();
+
+    return gpuInfo && gpuInfo->vendorId == vendorID && gpuInfo->deviceId == deviceID;
 }
 
 using ParamAvailabilityCache = std::map<PlatformParameters, bool>;
@@ -284,6 +298,11 @@ bool IsARM()
     return HasSystemVendorID(kVendorID_ARM);
 }
 
+bool IsSwiftshaderDevice()
+{
+    return HasSystemDeviceID(kVendorID_GOOGLE, kDeviceID_Swiftshader);
+}
+
 bool IsNVIDIA()
 {
 #if defined(ANGLE_PLATFORM_ANDROID)
@@ -319,6 +338,19 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters
             return true;
     }
 
+    // TODO: http://crbug.com/swiftshader/145
+    // Swiftshader does not currently have all the robustness features
+    // we need for ANGLE. In particular, it is unable to detect and recover
+    // from infinitely looping shaders. That bug is the tracker for fixing
+    // that and when resolved we can remove the following code.
+    // This test will disable tests marked with the config WithRobustness
+    // when run with the swiftshader Vulkan driver and on Android.
+    if ((param.isSwiftshader() || IsSwiftshaderDevice()) &&
+        param.eglParameters.robustness == EGL_TRUE)
+    {
+        return false;
+    }
+
     if (IsWindows())
     {
         switch (param.driver)
@@ -472,21 +504,6 @@ bool IsConfigWhitelisted(const SystemInfo &systemInfo, const PlatformParameters
             }
         }
 
-        // TODO: http://crbug.com/swiftshader/145
-        // Swiftshader does not currently have all the robustness features
-        // we need for ANGLE. In particular, it is unable to detect and recover
-        // from infinitely looping shaders. That bug is the tracker for fixing
-        // that and when resolved we can remove the following code.
-        // This test will disable tests marked with the config WithRobustness
-        // when run with the swiftshader Vulkan driver and on Android.
-        DeviceID deviceID =
-            systemInfo.gpus.empty() ? 0 : systemInfo.gpus[systemInfo.activeGPUIndex].deviceId;
-        if ((param.isSwiftshader() || (IsGoogle(vendorID) && deviceID == kDeviceID_Swiftshader)) &&
-            param.eglParameters.robustness)
-        {
-            return false;
-        }
-
         // Currently we support the GLES and Vulkan back-ends on Android.
         switch (param.getRenderer())
         {

src/tests/test_utils/angle_test_instantiate.h

@@ -44,6 +44,9 @@ bool IsNVIDIA();
 bool IsARM();
 bool IsARM64();
 
+// GPU devices.
+bool IsSwiftshaderDevice();
+
 inline bool IsASan()
 {
 #if defined(ANGLE_WITH_ASAN)