Treat Pixel 2 XL and Pixel 2 the same

src/tests/deqp_support/deqp_egl_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //
@@ -238,4 +238,4 @@
 2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_context.* = SKIP
 2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_display.* = SKIP
 2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL
-2546 NEXUS5X : dEQP-EGL.functional.query_context.query_context.* = SKIP
\ No newline at end of file
+2546 NEXUS5X : dEQP-EGL.functional.query_context.query_context.* = SKIP

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //
@@ -633,8 +633,8 @@
 3590 VULKAN : dEQP-GLES31.functional.debug.negative_coverage.*exceed_shared_memory_size_limit = FAIL
 
 // Stencil textures (some missing support for base level):
-3683 VULKAN PIXEL2 : dEQP-GLES31.functional.stencil_texturing.format.* = FAIL
-3683 VULKAN PIXEL2 : dEQP-GLES31.functional.stencil_texturing.misc.compare_mode_effect = FAIL
+3683 VULKAN PIXEL2ORXL : dEQP-GLES31.functional.stencil_texturing.format.* = FAIL
+3683 VULKAN PIXEL2ORXL : dEQP-GLES31.functional.stencil_texturing.misc.compare_mode_effect = FAIL
 
 // Need to support non-color when staging image updates
 3949 VULKAN : dEQP-GLES31.functional.stencil_texturing.misc.base_level = SKIP

src/tests/deqp_support/deqp_gles3_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //
@@ -564,9 +564,9 @@
 2808 ANDROID VULKAN : dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_w = FAIL
 
 // Pixel driver issues
-4024 PIXEL2 VULKAN : dEQP-GLES3.functional.draw.random.5 = SKIP
-4024 PIXEL2 VULKAN : dEQP-GLES3.functional.draw.random.49 = SKIP
-4024 PIXEL2 VULKAN : dEQP-GLES3.functional.draw.random.96 = FAIL
+4024 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.draw.random.5 = SKIP
+4024 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.draw.random.49 = SKIP
+4024 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.draw.random.96 = FAIL
 
 // Fixed in later driver versions.
 2727 VULKAN ANDROID : dEQP-GLES3.functional.shaders.builtin_variable.pointcoord = FAIL

src/tests/deqp_support/deqp_khr_gles2_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //

src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt

@@ -13,7 +13,7 @@
 //  NVIDIA AMD INTEL
 //  DEBUG RELEASE
 //  D3D9 D3D11 OPENGL GLES VULKAN
-//  NEXUS5X PIXEL2
+//  NEXUS5X PIXEL2ORXL
 //  QUADROP400
 //
 //

src/tests/gl_tests/ProgramBinaryTest.cpp

@@ -878,7 +878,7 @@ TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying)
     ANGLE_SKIP_TEST_IF(!getAvailableProgramBinaryFormatCount());
 
     // http://anglebug.com/3690
-    ANGLE_SKIP_TEST_IF(IsAndroid() && IsPixel2() && IsVulkan());
+    ANGLE_SKIP_TEST_IF(IsAndroid() && (IsPixel2() || IsPixel2XL()) && IsVulkan());
 
     std::vector<uint8_t> binary(0);
     GLint programLength = 0;

src/tests/test_expectations/GPUTestConfig.cpp

@@ -460,6 +460,12 @@ inline bool IsPixel2()
     return IsAndroidDevice("Pixel 2");
 }
 
+// Check whether the system is a Pixel 2XL device.
+inline bool IsPixel2XL()
+{
+    return IsAndroidDevice("Pixel 2 XL");
+}
+
 // Check whether the active GPU is a specific device based on the string device ID.
 inline bool IsDeviceIdGPU(const std::string &gpuDeviceId)
 {
@@ -549,26 +555,26 @@ GPUTestConfig::GPUTestConfig()
     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[kConditionD3D9]        = true;
+    mConditions[kConditionD3D11]       = true;
+    mConditions[kConditionGLDesktop]   = true;
+    mConditions[kConditionGLES]        = true;
+    mConditions[kConditionVulkan]      = true;
     mConditions[kConditionSwiftShader] = true;
 
     mConditions[kConditionNexus5X]          = IsNexus5X();
-    mConditions[kConditionPixel2]           = IsPixel2();
+    mConditions[kConditionPixel2OrXL]       = IsPixel2() || IsPixel2XL();
     mConditions[kConditionNVIDIAQuadroP400] = IsNVIDIAQuadroP400();
 }
 
 // If the constructor is passed an API, load those conditions as well
 GPUTestConfig::GPUTestConfig(const API &api) : GPUTestConfig()
 {
-    mConditions[kConditionD3D9]      = IsD3D9(api);
-    mConditions[kConditionD3D11]     = IsD3D11(api);
-    mConditions[kConditionGLDesktop] = IsGLDesktop(api);
-    mConditions[kConditionGLES]      = IsGLES(api);
-    mConditions[kConditionVulkan]    = IsVulkan(api);
+    mConditions[kConditionD3D9]        = IsD3D9(api);
+    mConditions[kConditionD3D11]       = IsD3D11(api);
+    mConditions[kConditionGLDesktop]   = IsGLDesktop(api);
+    mConditions[kConditionGLES]        = IsGLES(api);
+    mConditions[kConditionVulkan]      = IsVulkan(api);
     mConditions[kConditionSwiftShader] = IsSwiftShader(api);
 }
 

src/tests/test_expectations/GPUTestConfig.h

@@ -60,7 +60,7 @@ struct GPUTestConfig
         kConditionGLES,
         kConditionVulkan,
         kConditionNexus5X,
-        kConditionPixel2,
+        kConditionPixel2OrXL,
         kConditionNVIDIAQuadroP400,
         kConditionSwiftShader,
 

src/tests/test_expectations/GPUTestExpectationsParser.cpp

@@ -147,7 +147,7 @@ const TokenInfo kTokenData[kNumberOfTokens] = {
     {"vulkan", GPUTestConfig::kConditionVulkan},
     {"swiftshader", GPUTestConfig::kConditionSwiftShader},
     {"nexus5x", GPUTestConfig::kConditionNexus5X},
-    {"pixel2", GPUTestConfig::kConditionPixel2},
+    {"pixel2orxl", GPUTestConfig::kConditionPixel2OrXL},
     {"quadrop400", GPUTestConfig::kConditionNVIDIAQuadroP400},
     {"pass", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestPass},
     {"fail", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestFail},

src/tests/test_expectations/GPUTestExpectationsTest.cpp

@@ -27,7 +27,8 @@ class GPUTestConfigTest : public ANGLETest
         EXPECT_EQ(IsLinux(), config.getConditions()[GPUTestConfig::kConditionLinux]);
         EXPECT_EQ(IsAndroid(), config.getConditions()[GPUTestConfig::kConditionAndroid]);
         EXPECT_EQ(IsNexus5X(), config.getConditions()[GPUTestConfig::kConditionNexus5X]);
-        EXPECT_EQ(IsPixel2(), config.getConditions()[GPUTestConfig::kConditionPixel2]);
+        EXPECT_EQ((IsPixel2() || IsPixel2XL()),
+                  config.getConditions()[GPUTestConfig::kConditionPixel2OrXL]);
         EXPECT_EQ(IsIntel(), config.getConditions()[GPUTestConfig::kConditionIntel]);
         EXPECT_EQ(IsAMD(), config.getConditions()[GPUTestConfig::kConditionAMD]);
         EXPECT_EQ(IsNVIDIA(), config.getConditions()[GPUTestConfig::kConditionNVIDIA]);

src/tests/test_utils/angle_test_instantiate.cpp

@@ -222,6 +222,11 @@ bool IsPixel2()
     return IsAndroidDevice("Pixel 2");
 }
 
+bool IsPixel2XL()
+{
+    return IsAndroidDevice("Pixel 2 XL");
+}
+
 bool IsNVIDIAShield()
 {
     return IsAndroidDevice("SHIELD Android TV");

src/tests/test_utils/angle_test_instantiate.h

@@ -32,6 +32,7 @@ bool IsNexus6P();
 bool IsNexus9();
 bool IsPixelXL();
 bool IsPixel2();
+bool IsPixel2XL();
 bool IsNVIDIAShield();
 
 // Desktop devices.