Suppress dEQP.KHR_GLES31/core_vertex_attrib_binding_basicinputcase5

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -126,3 +126,7 @@
 
 // New failures with latest dEQP roll (2020-04-28)
 4593 SWIFTSHADER : KHR-GLES31.core.nearest_edge.offset_left = FAIL
+
+// Started failing on SwANGLE and Pixel 2 Vulkan after clang roll
+5500 SWIFTSHADER : KHR-GLES31.core.vertex_attrib_binding.basic-input-case5 = FAIL
+5500 VULKAN PIXEL2ORXL : KHR-GLES31.core.vertex_attrib_binding.basic-input-case5 = FAIL
\ No newline at end of file

src/tests/test_expectations/GPUTestConfig.cpp

@@ -537,7 +537,9 @@ inline bool IsMetal(const GPUTestConfig::API &api)
 }  // anonymous namespace
 
 // Load all conditions in the constructor since this data will not change during a test set.
-GPUTestConfig::GPUTestConfig()
+GPUTestConfig::GPUTestConfig() : GPUTestConfig(false) {}
+
+GPUTestConfig::GPUTestConfig(bool isSwiftShader)
 {
     mConditions[kConditionNone]            = false;
     mConditions[kConditionWinXP]           = IsWinXP();
@@ -560,24 +562,27 @@ GPUTestConfig::GPUTestConfig()
     mConditions[kConditionIOS]             = IsIOS();
     mConditions[kConditionLinux]           = IsLinux();
     mConditions[kConditionAndroid]         = IsAndroid();
-    mConditions[kConditionNVIDIA]          = IsNVIDIA();
-    mConditions[kConditionAMD]             = IsAMD();
-    mConditions[kConditionIntel]           = IsIntel();
-    mConditions[kConditionVMWare]          = IsVMWare();
-    mConditions[kConditionRelease]         = IsRelease();
-    mConditions[kConditionDebug]           = IsDebug();
+    // HW vendors are irrelevant if we are running on SW
+    mConditions[kConditionNVIDIA]      = !isSwiftShader && IsNVIDIA();
+    mConditions[kConditionAMD]         = !isSwiftShader && IsAMD();
+    mConditions[kConditionIntel]       = !isSwiftShader && IsIntel();
+    mConditions[kConditionVMWare]      = !isSwiftShader && IsVMWare();
+    mConditions[kConditionSwiftShader] = isSwiftShader;
+
+    mConditions[kConditionRelease] = IsRelease();
+    mConditions[kConditionDebug]   = IsDebug();
     // If no API provided, pass these conditions by default
-    mConditions[kConditionD3D9]        = true;
-    mConditions[kConditionD3D11]       = true;
-    mConditions[kConditionGLDesktop]   = true;
-    mConditions[kConditionGLES]        = true;
-    mConditions[kConditionVulkan]      = true;
-    mConditions[kConditionSwiftShader] = true;
-    mConditions[kConditionMetal]       = true;
-
-    mConditions[kConditionNexus5X]          = IsNexus5X();
-    mConditions[kConditionPixel2OrXL]       = IsPixel2() || IsPixel2XL();
-    mConditions[kConditionNVIDIAQuadroP400] = IsNVIDIAQuadroP400();
+    mConditions[kConditionD3D9]      = true;
+    mConditions[kConditionD3D11]     = true;
+    mConditions[kConditionGLDesktop] = true;
+    mConditions[kConditionGLES]      = true;
+    mConditions[kConditionVulkan]    = true;
+    mConditions[kConditionMetal]     = true;
+
+    // Devices are irrelevent if we are running on SW
+    mConditions[kConditionNexus5X]          = !isSwiftShader && IsNexus5X();
+    mConditions[kConditionPixel2OrXL]       = !isSwiftShader && (IsPixel2() || IsPixel2XL());
+    mConditions[kConditionNVIDIAQuadroP400] = !isSwiftShader && IsNVIDIAQuadroP400();
 
     mConditions[kConditionPreRotation]    = false;
     mConditions[kConditionPreRotation90]  = false;
@@ -586,15 +591,15 @@ GPUTestConfig::GPUTestConfig()
 }
 
 // If the constructor is passed an API, load those conditions as well
-GPUTestConfig::GPUTestConfig(const API &api, uint32_t preRotation) : GPUTestConfig()
-{
-    mConditions[kConditionD3D9]        = IsD3D9(api);
-    mConditions[kConditionD3D11]       = IsD3D11(api);
-    mConditions[kConditionGLDesktop]   = IsGLDesktop(api);
-    mConditions[kConditionGLES]        = IsGLES(api);
-    mConditions[kConditionVulkan]      = IsVulkan(api);
-    mConditions[kConditionSwiftShader] = IsSwiftShader(api);
-    mConditions[kConditionMetal]       = IsMetal(api);
+GPUTestConfig::GPUTestConfig(const API &api, uint32_t preRotation)
+    : GPUTestConfig(IsSwiftShader(api))
+{
+    mConditions[kConditionD3D9]      = IsD3D9(api);
+    mConditions[kConditionD3D11]     = IsD3D11(api);
+    mConditions[kConditionGLDesktop] = IsGLDesktop(api);
+    mConditions[kConditionGLES]      = IsGLES(api);
+    mConditions[kConditionVulkan]    = IsVulkan(api);
+    mConditions[kConditionMetal]     = IsMetal(api);
 
     switch (preRotation)
     {

src/tests/test_expectations/GPUTestConfig.h

@@ -77,6 +77,7 @@ struct GPUTestConfig
     using ConditionArray = angle::BitSet<GPUTestConfig::kNumberOfConditions>;
 
     GPUTestConfig();
+    GPUTestConfig(bool isSwiftShader);
     GPUTestConfig(const API &api, uint32_t preRotation);
 
     const GPUTestConfig::ConditionArray &getConditions() const;