Skip to content

A
angle
Commit f228038d by Courtney Goeltzenleuchter Committed by Commit Bot
Options

Treat Pixel 2 XL and Pixel 2 the same

When running on a Pixel 2 XL PIXEL2 expecations were not being applied. Both devices use the same chipset and have same capabilities so treat them the same for expectations. Bug: angleproject:4025 Change-Id: I5287e80c21b681765af540ed6dfbd053aa838c1c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1866076 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 4a80ba25
Showing with 41 additions and 29 deletions
src/tests/deqp_support/deqp_egl_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
...@@ -238,4 +238,4 @@ ...@@ -238,4 +238,4 @@
2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_context.* = SKIP 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_display.* = SKIP
2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL 2546 NEXUS5X : dEQP-EGL.functional.query_context.get_current_surface.r* = FAIL
2546 NEXUS5X : dEQP-EGL.functional.query_context.query_context.* = SKIP 2546 NEXUS5X : dEQP-EGL.functional.query_context.query_context.* = SKIP
\ No newline at end of file
src/tests/deqp_support/deqp_gles2_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
......
src/tests/deqp_support/deqp_gles31_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
...@@ -633,8 +633,8 @@ ...@@ -633,8 +633,8 @@
3590 VULKAN : dEQP-GLES31.functional.debug.negative_coverage.*exceed_shared_memory_size_limit = FAIL 3590 VULKAN : dEQP-GLES31.functional.debug.negative_coverage.*exceed_shared_memory_size_limit = FAIL
// Stencil textures (some missing support for base level): // Stencil textures (some missing support for base level):
3683 VULKAN PIXEL2 : dEQP-GLES31.functional.stencil_texturing.format.* = FAIL 3683 VULKAN PIXEL2ORXL : 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.misc.compare_mode_effect = FAIL
// Need to support non-color when staging image updates // Need to support non-color when staging image updates
3949 VULKAN : dEQP-GLES31.functional.stencil_texturing.misc.base_level = SKIP 3949 VULKAN : dEQP-GLES31.functional.stencil_texturing.misc.base_level = SKIP
......
src/tests/deqp_support/deqp_gles3_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
...@@ -564,9 +564,9 @@ ...@@ -564,9 +564,9 @@
2808 ANDROID VULKAN : dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_w = FAIL 2808 ANDROID VULKAN : dEQP-GLES3.functional.shaders.builtin_variable.fragcoord_w = FAIL
// Pixel driver issues // Pixel driver issues
4024 PIXEL2 VULKAN : dEQP-GLES3.functional.draw.random.5 = SKIP 4024 PIXEL2ORXL VULKAN : dEQP-GLES3.functional.draw.random.5 = SKIP
4024 PIXEL2 VULKAN : dEQP-GLES3.functional.draw.random.49 = SKIP 4024 PIXEL2ORXL 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.96 = FAIL
// Fixed in later driver versions. // Fixed in later driver versions.
2727 VULKAN ANDROID : dEQP-GLES3.functional.shaders.builtin_variable.pointcoord = FAIL 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 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
......
src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
......
src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// NVIDIA AMD INTEL // NVIDIA AMD INTEL
// DEBUG RELEASE // DEBUG RELEASE
// D3D9 D3D11 OPENGL GLES VULKAN // D3D9 D3D11 OPENGL GLES VULKAN
// NEXUS5X PIXEL2 // NEXUS5X PIXEL2ORXL
// QUADROP400 // QUADROP400
// //
// //
......
src/tests/gl_tests/ProgramBinaryTest.cpp
...@@ -878,7 +878,7 @@ TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying) ...@@ -878,7 +878,7 @@ TEST_P(ProgramBinaryTransformFeedbackTest, GetTransformFeedbackVarying)
ANGLE_SKIP_TEST_IF(!getAvailableProgramBinaryFormatCount()); ANGLE_SKIP_TEST_IF(!getAvailableProgramBinaryFormatCount());
// http://anglebug.com/3690 // 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); std::vector<uint8_t> binary(0);
GLint programLength = 0; GLint programLength = 0;
......
src/tests/test_expectations/GPUTestConfig.cpp
...@@ -460,6 +460,12 @@ inline bool IsPixel2() ...@@ -460,6 +460,12 @@ inline bool IsPixel2()
return IsAndroidDevice("Pixel 2"); 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. // Check whether the active GPU is a specific device based on the string device ID.
inline bool IsDeviceIdGPU(const std::string &gpuDeviceId) inline bool IsDeviceIdGPU(const std::string &gpuDeviceId)
{ {
...@@ -549,26 +555,26 @@ GPUTestConfig::GPUTestConfig() ...@@ -549,26 +555,26 @@ GPUTestConfig::GPUTestConfig()
mConditions[kConditionRelease] = IsRelease(); mConditions[kConditionRelease] = IsRelease();
mConditions[kConditionDebug] = IsDebug(); mConditions[kConditionDebug] = IsDebug();
// If no API provided, pass these conditions by default // If no API provided, pass these conditions by default
mConditions[kConditionD3D9] = true; mConditions[kConditionD3D9] = true;
mConditions[kConditionD3D11] = true; mConditions[kConditionD3D11] = true;
mConditions[kConditionGLDesktop] = true; mConditions[kConditionGLDesktop] = true;
mConditions[kConditionGLES] = true; mConditions[kConditionGLES] = true;
mConditions[kConditionVulkan] = true; mConditions[kConditionVulkan] = true;
mConditions[kConditionSwiftShader] = true; mConditions[kConditionSwiftShader] = true;
mConditions[kConditionNexus5X] = IsNexus5X(); mConditions[kConditionNexus5X] = IsNexus5X();
mConditions[kConditionPixel2] = IsPixel2(); mConditions[kConditionPixel2OrXL] = IsPixel2() || IsPixel2XL();
mConditions[kConditionNVIDIAQuadroP400] = IsNVIDIAQuadroP400(); mConditions[kConditionNVIDIAQuadroP400] = IsNVIDIAQuadroP400();
} }
// If the constructor is passed an API, load those conditions as well // If the constructor is passed an API, load those conditions as well
GPUTestConfig::GPUTestConfig(const API &api) : GPUTestConfig() GPUTestConfig::GPUTestConfig(const API &api) : GPUTestConfig()
{ {
mConditions[kConditionD3D9] = IsD3D9(api); mConditions[kConditionD3D9] = IsD3D9(api);
mConditions[kConditionD3D11] = IsD3D11(api); mConditions[kConditionD3D11] = IsD3D11(api);
mConditions[kConditionGLDesktop] = IsGLDesktop(api); mConditions[kConditionGLDesktop] = IsGLDesktop(api);
mConditions[kConditionGLES] = IsGLES(api); mConditions[kConditionGLES] = IsGLES(api);
mConditions[kConditionVulkan] = IsVulkan(api); mConditions[kConditionVulkan] = IsVulkan(api);
mConditions[kConditionSwiftShader] = IsSwiftShader(api); mConditions[kConditionSwiftShader] = IsSwiftShader(api);
} }
......
src/tests/test_expectations/GPUTestConfig.h
...@@ -60,7 +60,7 @@ struct GPUTestConfig ...@@ -60,7 +60,7 @@ struct GPUTestConfig
kConditionGLES, kConditionGLES,
kConditionVulkan, kConditionVulkan,
kConditionNexus5X, kConditionNexus5X,
kConditionPixel2, kConditionPixel2OrXL,
kConditionNVIDIAQuadroP400, kConditionNVIDIAQuadroP400,
kConditionSwiftShader, kConditionSwiftShader,
......
src/tests/test_expectations/GPUTestExpectationsParser.cpp
...@@ -147,7 +147,7 @@ const TokenInfo kTokenData[kNumberOfTokens] = { ...@@ -147,7 +147,7 @@ const TokenInfo kTokenData[kNumberOfTokens] = {
{"vulkan", GPUTestConfig::kConditionVulkan}, {"vulkan", GPUTestConfig::kConditionVulkan},
{"swiftshader", GPUTestConfig::kConditionSwiftShader}, {"swiftshader", GPUTestConfig::kConditionSwiftShader},
{"nexus5x", GPUTestConfig::kConditionNexus5X}, {"nexus5x", GPUTestConfig::kConditionNexus5X},
{"pixel2", GPUTestConfig::kConditionPixel2}, {"pixel2orxl", GPUTestConfig::kConditionPixel2OrXL},
{"quadrop400", GPUTestConfig::kConditionNVIDIAQuadroP400}, {"quadrop400", GPUTestConfig::kConditionNVIDIAQuadroP400},
{"pass", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestPass}, {"pass", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestPass},
{"fail", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestFail}, {"fail", GPUTestConfig::kConditionNone, GPUTestExpectationsParser::kGpuTestFail},
......
src/tests/test_expectations/GPUTestExpectationsTest.cpp
...@@ -27,7 +27,8 @@ class GPUTestConfigTest : public ANGLETest ...@@ -27,7 +27,8 @@ class GPUTestConfigTest : public ANGLETest
EXPECT_EQ(IsLinux(), config.getConditions()[GPUTestConfig::kConditionLinux]); EXPECT_EQ(IsLinux(), config.getConditions()[GPUTestConfig::kConditionLinux]);
EXPECT_EQ(IsAndroid(), config.getConditions()[GPUTestConfig::kConditionAndroid]); EXPECT_EQ(IsAndroid(), config.getConditions()[GPUTestConfig::kConditionAndroid]);
EXPECT_EQ(IsNexus5X(), config.getConditions()[GPUTestConfig::kConditionNexus5X]); 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(IsIntel(), config.getConditions()[GPUTestConfig::kConditionIntel]);
EXPECT_EQ(IsAMD(), config.getConditions()[GPUTestConfig::kConditionAMD]); EXPECT_EQ(IsAMD(), config.getConditions()[GPUTestConfig::kConditionAMD]);
EXPECT_EQ(IsNVIDIA(), config.getConditions()[GPUTestConfig::kConditionNVIDIA]); EXPECT_EQ(IsNVIDIA(), config.getConditions()[GPUTestConfig::kConditionNVIDIA]);
......
src/tests/test_utils/angle_test_instantiate.cpp
...@@ -222,6 +222,11 @@ bool IsPixel2() ...@@ -222,6 +222,11 @@ bool IsPixel2()
return IsAndroidDevice("Pixel 2"); return IsAndroidDevice("Pixel 2");
} }
bool IsPixel2XL()
{
return IsAndroidDevice("Pixel 2 XL");
}
bool IsNVIDIAShield() bool IsNVIDIAShield()
{ {
return IsAndroidDevice("SHIELD Android TV"); return IsAndroidDevice("SHIELD Android TV");
......
src/tests/test_utils/angle_test_instantiate.h
...@@ -32,6 +32,7 @@ bool IsNexus6P(); ...@@ -32,6 +32,7 @@ bool IsNexus6P();
bool IsNexus9(); bool IsNexus9();
bool IsPixelXL(); bool IsPixelXL();
bool IsPixel2(); bool IsPixel2();
bool IsPixel2XL();
bool IsNVIDIAShield(); bool IsNVIDIAShield();
// Desktop devices. // Desktop devices.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment