[dawn] Pixel 10 end2end tests unsupported for both gles and vulkan Bug: 40238674,475503907 Change-Id: I21d1b2d7f2412643e468e761fd125ddda8b75530 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/285495 Reviewed-by: Natalie Chouinard <chouinard@google.com> Commit-Queue: Peter McNeeley <petermcneeley@google.com>
diff --git a/src/dawn/tests/end2end/BufferZeroInitTests.cpp b/src/dawn/tests/end2end/BufferZeroInitTests.cpp index 74e7d55..34ea70b 100644 --- a/src/dawn/tests/end2end/BufferZeroInitTests.cpp +++ b/src/dawn/tests/end2end/BufferZeroInitTests.cpp
@@ -1134,8 +1134,8 @@ DAWN_SUPPRESS_TEST_IF(IsANGLE()); // TODO(crbug.com/dawn/1084) DAWN_SUPPRESS_TEST_IF(IsLinux() && IsVulkan() && IsNvidia()); // TODO(crbug.com/dawn/1214) - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm());
diff --git a/src/dawn/tests/end2end/CopyTests.cpp b/src/dawn/tests/end2end/CopyTests.cpp index ab57a5b..570eb31 100644 --- a/src/dawn/tests/end2end/CopyTests.cpp +++ b/src/dawn/tests/end2end/CopyTests.cpp
@@ -2185,8 +2185,8 @@ // Test that copying 2d texture array with binding view dimension set to cube. TEST_P(CopyTests_T2B_Compat, TextureCubeFull) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 32; constexpr uint32_t kHeight = 32; constexpr uint32_t kLayers = 6; @@ -2200,8 +2200,8 @@ // Test that copying a range of cube texture layers in one texture-to-buffer-copy works. TEST_P(CopyTests_T2B_Compat, TextureCubeSubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 32; constexpr uint32_t kHeight = 32; constexpr uint32_t kLayers = 6; @@ -2219,8 +2219,8 @@ // Test that copying texture 2D array mips with 256-byte aligned sizes works TEST_P(CopyTests_T2B_Compat, TextureCubeMip) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 32; constexpr uint32_t kHeight = 32; constexpr uint32_t kLayers = 6; @@ -2242,8 +2242,8 @@ // Test that copying from a range of texture 2D array layers in one texture-to-buffer-copy when // RowsPerImage is not equal to the height of the texture works. TEST_P(CopyTests_T2B_Compat, TextureCubeRegionNonzeroRowsPerImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 32; constexpr uint32_t kHeight = 32; constexpr uint32_t kLayers = 6; @@ -2286,8 +2286,8 @@ // Test that copying an entire texture with 256-byte aligned dimensions works TEST_P(CopyTests_B2T, FullTextureAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; @@ -2312,8 +2312,8 @@ // Test that copying an entire texture without 256-byte aligned dimensions works TEST_P(CopyTests_B2T, FullTextureUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; @@ -2325,8 +2325,8 @@ // Test that reading pixels from a 256-byte aligned texture works TEST_P(CopyTests_B2T, PixelReadAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; BufferSpec pixelBuffer = MinimumBufferSpec(1, 1); @@ -2374,8 +2374,8 @@ // Test that copying pixels from a texture that is not 256-byte aligned works TEST_P(CopyTests_B2T, PixelReadUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; BufferSpec pixelBuffer = MinimumBufferSpec(1, 1); @@ -2423,8 +2423,8 @@ // Test that copying regions with 256-byte aligned sizes works TEST_P(CopyTests_B2T, TextureRegionAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2294): diagnose T2B failures on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm()); @@ -2441,8 +2441,8 @@ // Test that copying regions without 256-byte aligned sizes works TEST_P(CopyTests_B2T, TextureRegionUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; @@ -2459,8 +2459,8 @@ // Test that copying mips with 256-byte aligned sizes works TEST_P(CopyTests_B2T, TextureMipAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; @@ -2478,8 +2478,8 @@ // Test that copying mips without 256-byte aligned sizes works TEST_P(CopyTests_B2T, TextureMipUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; @@ -2497,8 +2497,8 @@ // Test that copying with a 512-byte aligned buffer offset works TEST_P(CopyTests_B2T, OffsetBufferAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; @@ -2516,8 +2516,8 @@ // Test that copying without a 512-byte aligned buffer offset works TEST_P(CopyTests_B2T, OffsetBufferUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/459848482): Flaky on Win/Snapdragon X Elite w/ D3D11 and // backend validation. DAWN_SUPPRESS_TEST_IF(IsWindows() && IsQualcomm() && IsD3D11() && IsBackendValidationEnabled()); @@ -2542,8 +2542,8 @@ // Test that copying without a 512-byte aligned buffer offset that is greater than the bytes per row // works TEST_P(CopyTests_B2T, OffsetBufferUnalignedSmallBytesPerRow) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/459848482): Flaky on Win/Snapdragon X Elite w/ D3D11 and // backend validation. DAWN_SUPPRESS_TEST_IF(IsWindows() && IsQualcomm() && IsD3D11() && IsBackendValidationEnabled()); @@ -2565,8 +2565,8 @@ // Test that copying with a greater bytes per row than needed on a 256-byte aligned texture works TEST_P(CopyTests_B2T, BytesPerRowAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; @@ -2584,8 +2584,8 @@ // Test that copying with a greater bytes per row than needed on a texture that is not 256-byte // aligned works TEST_P(CopyTests_B2T, BytesPerRowUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; @@ -2603,8 +2603,8 @@ // Test that copying with bytesPerRow = 0 and bytesPerRow < bytesInACompleteRow works // when we're copying one row only TEST_P(CopyTests_B2T, BytesPerRowWithOneRowCopy) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; @@ -2621,8 +2621,8 @@ } TEST_P(CopyTests_B2T, StrideSpecialCases) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); TextureSpec textureSpec; textureSpec.textureSize = {4, 4, 4}; @@ -2654,8 +2654,8 @@ // Test that copying whole texture 2D array layers in one texture-to-buffer-copy works. TEST_P(CopyTests_B2T, Texture2DArrayFull) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -2668,8 +2668,8 @@ // Test that copying a range of texture 2D array layers in one texture-to-buffer-copy works. TEST_P(CopyTests_B2T, Texture2DArraySubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -2687,8 +2687,8 @@ // Test that copying into a range of texture 2D array layers in one texture-to-buffer-copy when // RowsPerImage is not equal to the height of the texture works. TEST_P(CopyTests_B2T, Texture2DArrayRegionNonzeroRowsPerImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 6u; @@ -2709,8 +2709,8 @@ // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is not a // multiple of 512. TEST_P(CopyTests_B2T, Texture2DArrayRegionWithOffsetOddRowsPerImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; @@ -2733,8 +2733,8 @@ // Test a special code path in the D3D12 backends when (BytesPerRow * RowsPerImage) is a multiple // of 512. TEST_P(CopyTests_B2T, Texture2DArrayRegionWithOffsetEvenRowsPerImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 64; constexpr uint32_t kHeight = 128; constexpr uint32_t kLayers = 8u; @@ -2756,8 +2756,8 @@ // Test that copying whole texture 3D in one buffer-to-texture-copy works. TEST_P(CopyTests_B2T, Texture3DFull) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6; @@ -2771,8 +2771,8 @@ // Test that copying a range of texture 3D Depths in one texture-to-buffer-copy works. TEST_P(CopyTests_B2T, Texture3DSubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6; @@ -2788,8 +2788,8 @@ } TEST_P(CopyTests_B2T, Texture3DNoSplitRowDataWithEmptyFirstRow) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 2; constexpr uint32_t kHeight = 4; constexpr uint32_t kDepth = 3; @@ -2812,8 +2812,8 @@ } TEST_P(CopyTests_B2T, Texture3DSplitRowDataWithoutEmptyFirstRow) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 259; constexpr uint32_t kHeight = 127; constexpr uint32_t kDepth = 3; @@ -2831,8 +2831,8 @@ } TEST_P(CopyTests_B2T, Texture3DSplitRowDataWithEmptyFirstRow) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 39; constexpr uint32_t kHeight = 4; constexpr uint32_t kDepth = 3; @@ -2854,8 +2854,8 @@ } TEST_P(CopyTests_B2T, Texture3DCopyHeightIsOneCopyWidthIsTiny) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2294): diagnose T2B failures on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm()); @@ -2881,8 +2881,8 @@ } TEST_P(CopyTests_B2T, Texture3DCopyHeightIsOneCopyWidthIsSmall) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 39; constexpr uint32_t kHeight = 1; constexpr uint32_t kDepth = 3; @@ -2907,8 +2907,8 @@ // Test that copying texture 3D array mips with 256-byte aligned sizes works TEST_P(CopyTests_B2T, Texture3DMipAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 64u; @@ -2928,8 +2928,8 @@ // Test that copying texture 3D array mips with 256-byte unaligned sizes works TEST_P(CopyTests_B2T, Texture3DMipUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 261; constexpr uint32_t kHeight = 123; constexpr uint32_t kDepth = 69u; @@ -3215,8 +3215,8 @@ // A regression test (from WebGPU CTS) for an Intel D3D12 driver bug about T2T copy with specific // texture formats. See http://crbug.com/1161355 for more details. TEST_P(CopyTests_T2T, CopyFromNonZeroMipLevelWithTexelBlockSizeLessThan4Bytes) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/473582006): [Capture] issue calling ResolveDeferredExpectationsNow. DAWN_SUPPRESS_TEST_IF(IsCaptureReplayCheckingEnabled()); @@ -3305,8 +3305,8 @@ // Test that copying whole 3D texture in one texture-to-texture-copy works. TEST_P(CopyTests_T2T, Texture3DFull) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2294): diagnose T2B failures on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm()); @@ -3322,8 +3322,8 @@ // Test that copying from one mip level to another mip level within the same 3D texture works. TEST_P(CopyTests_T2T, Texture3DSameTextureDifferentMipLevels) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6u; @@ -3358,8 +3358,8 @@ // Test that copying between 3D texture and 2D array textures works. It includes partial copy // for src and/or dst texture, non-zero offset (copy origin), non-zero mip level. TEST_P(CopyTests_T2T, Texture3DAnd2DArraySubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2294): diagnose T2B failures on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm()); @@ -3422,8 +3422,8 @@ // Test that copying whole 2D array to a 3D texture in one texture-to-texture-copy works. TEST_P(CopyTests_T2T, Texture2DArrayTo3DFull) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6u; @@ -3437,8 +3437,8 @@ // Test that copying subregion of a 3D texture in one texture-to-texture-copy works. TEST_P(CopyTests_T2T, Texture3DSubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6u; @@ -3466,8 +3466,8 @@ // Test that copying subregion of a 2D array to a 3D texture to in one texture-to-texture-copy // works. TEST_P(CopyTests_T2T, Texture2DArrayTo3DSubRegion) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 6u; @@ -3481,8 +3481,8 @@ // Test that copying texture 3D array mips in one texture-to-texture-copy works TEST_P(CopyTests_T2T, Texture3DMipAligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 256; constexpr uint32_t kHeight = 128; constexpr uint32_t kDepth = 64u; @@ -3502,8 +3502,8 @@ // Test that copying texture 3D array mips in one texture-to-texture-copy works TEST_P(CopyTests_T2T, Texture3DMipUnaligned) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 261; constexpr uint32_t kHeight = 123; constexpr uint32_t kDepth = 69u;
diff --git a/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp b/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp index c075f9d..fd1c347 100644 --- a/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp +++ b/src/dawn/tests/end2end/CreatePipelineAsyncTests.cpp
@@ -892,8 +892,8 @@ // Verify calling CreateRenderPipelineAsync() with valid depthStencilState works on all backends. TEST_P(CreatePipelineAsyncTest, CreateRenderPipelineAsyncWithDepthStencilState) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::TextureDescriptor textureDescriptor; textureDescriptor.size = {1, 1, 1};
diff --git a/src/dawn/tests/end2end/DepthBiasTests.cpp b/src/dawn/tests/end2end/DepthBiasTests.cpp index fe2c840..024a5a0 100644 --- a/src/dawn/tests/end2end/DepthBiasTests.cpp +++ b/src/dawn/tests/end2end/DepthBiasTests.cpp
@@ -166,8 +166,8 @@ // Test adding positive bias to output TEST_P(DepthBiasTests, PositiveBiasOnFloat) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // NVIDIA GPUs under Vulkan seem to be using a different scale than everyone else. DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia()); @@ -210,8 +210,8 @@ // Test adding negative bias to output TEST_P(DepthBiasTests, NegativeBiasOnFloat) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // NVIDIA GPUs seems to be using a different scale than everyone else DAWN_SUPPRESS_TEST_IF(IsVulkan() && IsNvidia()); // Draw quad flat on z = 0.25 with -0.25 bias, depth clear of 0.125 @@ -250,8 +250,8 @@ // Test tiledX quad with no bias TEST_P(DepthBiasTests, NoBiasTiltedXOnFloat) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Draw quad with z from 0 to 0.5 with no bias RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::TiltedX, 0, 0, 0); @@ -267,8 +267,8 @@ // Test adding positive slope bias to output TEST_P(DepthBiasTests, PositiveSlopeBiasOnFloat) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Draw quad with z from 0 to 0.5 with a slope bias of 1 RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::TiltedX, 0, 1, 0); @@ -284,8 +284,8 @@ // Test adding negative half slope bias to output TEST_P(DepthBiasTests, NegativeHalfSlopeBiasOnFloat) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Draw quad with z from 0 to 0.5 with a slope bias of -0.5 RunDepthBiasTest(wgpu::TextureFormat::Depth32Float, 0, QuadAngle::TiltedX, 0, -0.5, 0);
diff --git a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp index 6e59860..b53e76c 100644 --- a/src/dawn/tests/end2end/DepthStencilCopyTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilCopyTests.cpp
@@ -1150,8 +1150,8 @@ // Test copying the stencil-only aspect into a buffer. TEST_P(StencilCopyTests, FromStencilAspect) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(42242119): hang/crash on Qualcomm Adreno X1. DAWN_SUPPRESS_TEST_IF(IsD3D11() && IsQualcomm()); @@ -1179,8 +1179,8 @@ // Test copying the stencil-only aspect into a buffer at a non-zero offset TEST_P(StencilCopyTests, FromStencilAspectAtNonZeroOffset) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(42242119): hang/crash on Qualcomm Adreno X1. DAWN_SUPPRESS_TEST_IF(IsD3D11() && IsQualcomm()); @@ -1210,8 +1210,8 @@ // Test copying the non-zero mip, stencil-only aspect into a buffer. TEST_P(StencilCopyTests, FromNonZeroMipStencilAspect) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(42242119): hang/crash on Qualcomm Adreno X1. DAWN_SUPPRESS_TEST_IF(IsD3D11() && IsQualcomm()); @@ -1341,16 +1341,16 @@ // Test copying to the stencil-aspect of a texture TEST_P(StencilCopyTests, ToStencilAspect) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kBufferCopyOffset = 0; DoCopyToStencilTest(kBufferCopyOffset); } // Test copying to the stencil-aspect of a texture at non-zero offset TEST_P(StencilCopyTests, ToStencilAspectAtNonZeroOffset) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr std::array<uint32_t, 2> kBufferCopyOffsets = {8, 512}; for (uint32_t offset : kBufferCopyOffsets) { DoCopyToStencilTest(offset); @@ -1408,8 +1408,8 @@ }; TEST_P(StencilCopyTests_Compat, FromStencilAspect) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kTestLevel = 0; constexpr uint32_t kBufferCopyOffset = 0; constexpr uint32_t kTestTextureSizes[][2] = { @@ -1429,8 +1429,8 @@ // Test copying the stencil-only aspect into a buffer at a non-zero offset TEST_P(StencilCopyTests_Compat, FromStencilAspectAtNonZeroOffset) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kTestLevel = 0; constexpr std::array<uint32_t, 2> kBufferCopyOffsets = {4u, 512u}; constexpr uint32_t kTestTextureSizes[][2] = { @@ -1451,8 +1451,8 @@ // Test copying the non-zero mip, stencil-only aspect into a buffer. TEST_P(StencilCopyTests_Compat, FromNonZeroMipStencilAspect) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 9; constexpr uint32_t kHeight = 9; constexpr uint32_t kBufferCopyOffset = 0;
diff --git a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp index 4495f6b..f82019c 100644 --- a/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilSamplingTests.cpp
@@ -644,8 +644,8 @@ // TODO(crbug.com/444741058): Fails on Intel-based brya devices running Android Desktop. DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsIntel() && IsAndroid()); - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kWidth = 16; wgpu::ShaderModule module = utils::CreateShaderModule(device, R"(
diff --git a/src/dawn/tests/end2end/DepthStencilStateTests.cpp b/src/dawn/tests/end2end/DepthStencilStateTests.cpp index 04cd380..e17337d 100644 --- a/src/dawn/tests/end2end/DepthStencilStateTests.cpp +++ b/src/dawn/tests/end2end/DepthStencilStateTests.cpp
@@ -449,32 +449,32 @@ } TEST_P(DepthStencilStateTest, DepthEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::Equal, false, true, false); } TEST_P(DepthStencilStateTest, DepthGreater) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::Greater, false, false, true); } TEST_P(DepthStencilStateTest, DepthGreaterEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::GreaterEqual, false, true, true); } TEST_P(DepthStencilStateTest, DepthLess) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::Less, true, false, false); } TEST_P(DepthStencilStateTest, DepthLessEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::LessEqual, true, true, false); } @@ -483,8 +483,8 @@ } TEST_P(DepthStencilStateTest, DepthNotEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckDepthCompareFunction(wgpu::CompareFunction::NotEqual, true, false, true); } @@ -539,44 +539,44 @@ } TEST_P(DepthStencilStateTest, StencilEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::Equal, false, true, false); } TEST_P(DepthStencilStateTest, StencilGreater) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::Greater, false, false, true); } TEST_P(DepthStencilStateTest, StencilGreaterEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::GreaterEqual, false, true, true); } TEST_P(DepthStencilStateTest, StencilLess) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::Less, true, false, false); } TEST_P(DepthStencilStateTest, StencilLessEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::LessEqual, true, true, false); } TEST_P(DepthStencilStateTest, StencilNever) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::Never, false, false, false); } TEST_P(DepthStencilStateTest, StencilNotEqual) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); CheckStencilCompareFunction(wgpu::CompareFunction::NotEqual, true, false, true); } @@ -619,8 +619,8 @@ // Check that the setting a stencil read mask works TEST_P(DepthStencilStateTest, StencilReadMask) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::StencilFaceState baseStencilFaceDescriptor; baseStencilFaceDescriptor.compare = wgpu::CompareFunction::Always; baseStencilFaceDescriptor.failOp = wgpu::StencilOperation::Keep; @@ -660,8 +660,8 @@ // Check that setting a stencil write mask works TEST_P(DepthStencilStateTest, StencilWriteMask) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::StencilFaceState baseStencilFaceDescriptor; baseStencilFaceDescriptor.compare = wgpu::CompareFunction::Always; baseStencilFaceDescriptor.failOp = wgpu::StencilOperation::Keep; @@ -830,8 +830,8 @@ // Test that the front and back stencil states are set correctly (and take frontFace into account) TEST_P(DepthStencilStateTest, StencilFrontAndBackFace) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::DepthStencilState state; state.depthWriteEnabled = wgpu::OptionalBool::False; state.depthCompare = wgpu::CompareFunction::Always; @@ -847,8 +847,8 @@ // Test that the depth reference of a new render pass is initialized to default value 0 TEST_P(DepthStencilStateTest, StencilReferenceInitialized) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::DepthStencilState stencilAlwaysReplaceState; stencilAlwaysReplaceState.depthWriteEnabled = wgpu::OptionalBool::False; stencilAlwaysReplaceState.depthCompare = wgpu::CompareFunction::Always;
diff --git a/src/dawn/tests/end2end/DrawIndexedTests.cpp b/src/dawn/tests/end2end/DrawIndexedTests.cpp index d07dc97..de26d75 100644 --- a/src/dawn/tests/end2end/DrawIndexedTests.cpp +++ b/src/dawn/tests/end2end/DrawIndexedTests.cpp
@@ -172,8 +172,8 @@ TEST_P(DrawIndexedTest, NegativeBaseVertex) { DAWN_TEST_UNSUPPORTED_IF(HasToggleEnabled("disable_base_vertex")); - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/343178421): ANGLE/SwiftShader and ANGLE/D3D11 fail with negative baseVertex. DAWN_SUPPRESS_TEST_IF(IsANGLESwiftShader());
diff --git a/src/dawn/tests/end2end/MaxLimitTests.cpp b/src/dawn/tests/end2end/MaxLimitTests.cpp index c207e81..ae6bc5d 100644 --- a/src/dawn/tests/end2end/MaxLimitTests.cpp +++ b/src/dawn/tests/end2end/MaxLimitTests.cpp
@@ -721,8 +721,8 @@ // TODO(http://crbug.com/348199037): VUID-RuntimeSpirv-Location-06428 DAWN_SUPPRESS_TEST_IF(IsLinux() && IsVulkan() && IsNvidia()); - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Compute the number of each resource type (storage buffers and storage textures) such that // there is at least one color attachment, and as many of the buffer/textures as possible,
diff --git a/src/dawn/tests/end2end/QueryTests.cpp b/src/dawn/tests/end2end/QueryTests.cpp index 28b412b..5997095 100644 --- a/src/dawn/tests/end2end/QueryTests.cpp +++ b/src/dawn/tests/end2end/QueryTests.cpp
@@ -246,8 +246,8 @@ // zero indicates that no sample passed depth/stencil testing, // non-zero indicates that at least one sample passed depth/stencil testing. TEST_P(OcclusionQueryTests, QueryWithDepthStencilTest) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(dawn:1870): D3D11_QUERY_OCCLUSION_PREDICATE doesn't work on Intel Gen12. DAWN_SUPPRESS_TEST_IF(IsD3D11() && IsIntelGen12()); @@ -269,8 +269,8 @@ // zero indicates that no sample passed scissor testing, // non-zero indicates that at least one sample passed scissor testing. TEST_P(OcclusionQueryTests, QueryWithScissorTest) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(dawn:1870): D3D11_QUERY_OCCLUSION_PREDICATE doesn't work on Intel Gen12. DAWN_SUPPRESS_TEST_IF(IsD3D11() && IsIntelGen12()); @@ -283,8 +283,8 @@ // Test begin occlusion query with same query index on different render pass TEST_P(OcclusionQueryTests, Rewrite) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kQueryCount = 1; wgpu::QuerySet querySet = CreateOcclusionQuerySet(kQueryCount); @@ -323,8 +323,8 @@ // Test resolving occlusion query correctly if the queries are written sparsely, which also tests // the query resetting at the start of render passes on Vulkan backend. TEST_P(OcclusionQueryTests, ResolveSparseQueries) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kQueryCount = 7; wgpu::QuerySet querySet = CreateOcclusionQuerySet(kQueryCount); @@ -550,8 +550,8 @@ // Test resolving occlusion query to the destination buffer with offset TEST_P(OcclusionQueryTests, ResolveToBufferWithOffset) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 6 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsARM());
diff --git a/src/dawn/tests/end2end/QueueTests.cpp b/src/dawn/tests/end2end/QueueTests.cpp index 7a68dd2..c3a83e6 100644 --- a/src/dawn/tests/end2end/QueueTests.cpp +++ b/src/dawn/tests/end2end/QueueTests.cpp
@@ -634,8 +634,8 @@ // Test with bytesPerRow greater than needed for cube textures. // Made for testing compat behavior. TEST_P(QueueWriteTextureTests, VaryingBytesPerRowCube) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); auto format = GetParam().mTextureFormat; // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm());
diff --git a/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp b/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp index 058de6b..66940e4 100644 --- a/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp +++ b/src/dawn/tests/end2end/ReadOnlyDepthStencilAttachmentTests.cpp
@@ -358,8 +358,8 @@ class ReadOnlyStencilAttachmentTests : public ReadOnlyDepthStencilAttachmentTests {}; TEST_P(ReadOnlyStencilAttachmentTests, SampleFromAttachment) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // stencilRefValue < stencilValue (stencilInitValue), so stencil test passes. The pipeline // samples from stencil buffer and writes into color buffer. { @@ -388,8 +388,8 @@ } TEST_P(ReadOnlyStencilAttachmentTests, NotSampleFromAttachment) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // stencilRefValue < stencilValue (stencilInitValue), so stencil test passes. The pipeline // draw solid blue into color buffer. { @@ -427,8 +427,8 @@ // Test that using stencilReadOnly while modifying the depth aspect works. TEST_P(ReadOnlyDepthAndStencilAttachmentTests, ModifyDepthSampleStencil) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Stencil test is always true but the depth test passes only for the TestSpec spec1; spec1.readonlyAspects = wgpu::TextureAspect::StencilOnly; @@ -480,8 +480,8 @@ // Test sampling depth with both the depth and stencil readonly. TEST_P(ReadOnlyDepthAndStencilAttachmentTests, BothReadOnlySampleDepth) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Sample the depth while using both depth an stencil testing. // First render: depth test passes only for the bottom half, stencil passes. @@ -504,8 +504,8 @@ // Test sampling stencil with both the depth and stencil readonly. TEST_P(ReadOnlyDepthAndStencilAttachmentTests, BothReadOnlySampleStencil) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Sample the stencil while using both depth an stencil testing. // First render: depth test passes only for the bottom half, stencil passes.
diff --git a/src/dawn/tests/end2end/StorageTextureTests.cpp b/src/dawn/tests/end2end/StorageTextureTests.cpp index bc60516..434b1fd 100644 --- a/src/dawn/tests/end2end/StorageTextureTests.cpp +++ b/src/dawn/tests/end2end/StorageTextureTests.cpp
@@ -913,8 +913,8 @@ // Test that write-only storage textures are supported in compute shader. TEST_P(StorageTextureTests, WriteonlyStorageTextureInComputeShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); for (wgpu::TextureFormat format : utils::kAllTextureFormats) { if (!utils::TextureFormatSupportsStorageTexture(format, device, IsCompatibilityMode())) { continue; @@ -941,8 +941,8 @@ // Test that write-only storage textures are supported in fragment shader. TEST_P(StorageTextureTests, WriteonlyStorageTextureInFragmentShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm()); @@ -981,8 +981,8 @@ // Verify 2D array and 3D write-only storage textures work correctly. TEST_P(StorageTextureTests, Writeonly2DArrayOr3DStorageTexture) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr uint32_t kSliceCount = 3u; constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint; @@ -1012,8 +1012,8 @@ // Verify 1D write-only storage textures work correctly. TEST_P(StorageTextureTests, Writeonly1DStorageTexture) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint; // Prepare the write-only storage texture. @@ -1034,8 +1034,8 @@ // Test that multiple dispatches to increment values by ping-ponging between a sampled texture and // a write-only storage texture are synchronized in one pass. TEST_P(StorageTextureTests, SampledAndWriteonlyStorageTexturePingPong) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint; wgpu::Texture storageTexture1 = CreateTexture(kTextureFormat, @@ -1230,8 +1230,8 @@ // Verify that the texture is correctly cleared to 0 before its first usage as a write-only storage // storage texture in a render pass. TEST_P(StorageTextureZeroInitTests, WriteonlyStorageTextureClearsToZeroInRenderPass) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageTexturesInFragmentStage < 1); // Prepare the write-only storage texture. @@ -1249,8 +1249,8 @@ // Verify that the texture is correctly cleared to 0 before its first usage as a write-only storage // texture in a compute pass. TEST_P(StorageTextureZeroInitTests, WriteonlyStorageTextureClearsToZeroInComputePass) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // Prepare the write-only storage texture. wgpu::Texture writeonlyStorageTexture = CreateTexture( wgpu::TextureFormat::R32Uint, @@ -1344,15 +1344,15 @@ // Verify read-write storage texture can work correctly in compute shaders. TEST_P(ReadWriteStorageTextureTests, ReadWriteStorageTextureInComputeShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); RunReadWriteStorageTextureTest(wgpu::TextureFormat::R32Uint); } // Verify read-write storage texture can work correctly in fragment shaders. TEST_P(ReadWriteStorageTextureTests, ReadWriteStorageTextureInFragmentShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageTexturesInFragmentStage < 1); std::array<uint32_t, kWidth * kHeight> inputData; @@ -1421,8 +1421,8 @@ // Verify read-only storage texture can work correctly in compute shaders. TEST_P(ReadWriteStorageTextureTests, ReadOnlyStorageTextureInComputeShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr wgpu::TextureFormat kStorageTextureFormat = wgpu::TextureFormat::R32Uint; const std::vector<uint8_t> kInitialTextureData = GetExpectedData(kStorageTextureFormat); wgpu::Texture readonlyStorageTexture = CreateTextureWithTestData( @@ -1475,8 +1475,8 @@ // Verify read-only storage texture can work correctly in vertex shaders. TEST_P(ReadWriteStorageTextureTests, ReadOnlyStorageTextureInVertexShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageTexturesInVertexStage < 1); constexpr wgpu::TextureFormat kStorageTextureFormat = wgpu::TextureFormat::R32Uint; @@ -1525,8 +1525,8 @@ // Verify read-only storage texture can work correctly in fragment shaders. TEST_P(ReadWriteStorageTextureTests, ReadOnlyStorageTextureInFragmentShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DAWN_TEST_UNSUPPORTED_IF(GetSupportedLimits().maxStorageTexturesInFragmentStage < 1); constexpr wgpu::TextureFormat kStorageTextureFormat = wgpu::TextureFormat::R32Uint; @@ -1559,8 +1559,8 @@ // Verify using read-write storage texture access in pipeline layout is compatible with write-only // storage texture access in shader. TEST_P(ReadWriteStorageTextureTests, ReadWriteInPipelineLayoutAndWriteOnlyInShader) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); constexpr wgpu::TextureFormat kStorageTextureFormat = wgpu::TextureFormat::R32Uint; std::array<uint32_t, kWidth * kHeight> expectedData; for (size_t i = 0; i < expectedData.size(); ++i) { @@ -1967,8 +1967,8 @@ // This ensures that we insert a memory fence in between writes and reads to a read-write storage // texture to prevent reordering of memory operations within an invocation. TEST_P(ReadWriteStorageTextureTests, ReadWriteStorageTexture_ReadAfterWriteHazard) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // The texture dimensions need to be fairly large in order to reliably trigger a failure when // no fence is present. constexpr uint32_t kWidth = 1024;
diff --git a/src/dawn/tests/end2end/TextureFormatTests.cpp b/src/dawn/tests/end2end/TextureFormatTests.cpp index 001e034..2a54871 100644 --- a/src/dawn/tests/end2end/TextureFormatTests.cpp +++ b/src/dawn/tests/end2end/TextureFormatTests.cpp
@@ -583,15 +583,15 @@ // Test the R16Unorm format TEST_P(TextureFormatTest, R16Unorm) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DoUnormTest<uint16_t>({wgpu::TextureFormat::R16Unorm, 2, TextureComponentType::Float, 1}); } // Test the RG16Unorm format TEST_P(TextureFormatTest, RG16Unorm) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); DoUnormTest<uint16_t>({wgpu::TextureFormat::RG16Unorm, 4, TextureComponentType::Float, 2}); }
diff --git a/src/dawn/tests/end2end/TextureZeroInitTests.cpp b/src/dawn/tests/end2end/TextureZeroInitTests.cpp index df25e4e..7772a5d 100644 --- a/src/dawn/tests/end2end/TextureZeroInitTests.cpp +++ b/src/dawn/tests/end2end/TextureZeroInitTests.cpp
@@ -404,8 +404,8 @@ // This tests CopyBufferToTexture fully overwrites copy so lazy init is not needed. TEST_P(TextureZeroInitTest, CopyBufferToTexture) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); wgpu::TextureDescriptor descriptor = CreateTextureDescriptor(4, 1, wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::TextureBinding | @@ -732,8 +732,8 @@ // Test that clear state is tracked independently for depth/stencil textures. TEST_P(TextureZeroInitTest, IndependentDepthStencilLoadAfterDiscard) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(dawn:1549) Fails on Qualcomm-based Android devices. DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm());
diff --git a/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp b/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp index ab8d695..ed65337 100644 --- a/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp +++ b/src/dawn/tests/end2end/VertexOnlyRenderPipelineTests.cpp
@@ -232,8 +232,8 @@ // Test that a vertex-only render pipeline modify the depth attachment as same as a complete render // pipeline do. TEST_P(VertexOnlyRenderPipelineTest, Depth) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); // TODO(crbug.com/dawn/2295): diagnose this failure on Pixel 4 OpenGLES DAWN_SUPPRESS_TEST_IF(IsOpenGLES() && IsAndroid() && IsQualcomm());
diff --git a/src/dawn/tests/end2end/ViewportTests.cpp b/src/dawn/tests/end2end/ViewportTests.cpp index c4a54f5..a1e7208 100644 --- a/src/dawn/tests/end2end/ViewportTests.cpp +++ b/src/dawn/tests/end2end/ViewportTests.cpp
@@ -190,8 +190,8 @@ TEST_P(ViewportTest, DefaultViewportDepth) { // TODO(crbug.com/473870505): [Capture] support depth/stencil and multi-planar textures. DAWN_SUPPRESS_TEST_IF(IsCaptureReplayCheckingEnabled()); - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); TestViewportDepth(0.0, 1.0, false); } @@ -200,8 +200,8 @@ TEST_P(ViewportTest, ViewportDepth) { // TODO(crbug.com/473870505): [Capture] support depth/stencil and multi-planar textures. DAWN_SUPPRESS_TEST_IF(IsCaptureReplayCheckingEnabled()); - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); TestViewportDepth(0.0, 0.5); TestViewportDepth(0.5, 1.0);
diff --git a/src/dawn/tests/white_box/EGLImageWrappingTests.cpp b/src/dawn/tests/white_box/EGLImageWrappingTests.cpp index a386ba5..42e4e56 100644 --- a/src/dawn/tests/white_box/EGLImageWrappingTests.cpp +++ b/src/dawn/tests/white_box/EGLImageWrappingTests.cpp
@@ -445,8 +445,8 @@ // Test clearing a R8 EGLImage TEST_P(EGLImageUsageTests, ClearR8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); ScopedEGLImage eglImage = CreateEGLImage(1, 1, GL_R8, GL_RED, GL_UNSIGNED_BYTE, nullptr); uint8_t data = 0x01; @@ -456,8 +456,8 @@ // Test clearing a RG8 EGLImage TEST_P(EGLImageUsageTests, ClearRG8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); ScopedEGLImage eglImage = CreateEGLImage(1, 1, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, nullptr); uint16_t data = 0x0201; @@ -467,8 +467,8 @@ // Test clearing an RGBA8 EGLImage TEST_P(EGLImageUsageTests, ClearRGBA8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); ScopedEGLImage eglImage = CreateEGLImage(1, 1, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); uint32_t data = 0x04030201; @@ -478,8 +478,8 @@ // Test sampling an imported R8 GL texture TEST_P(EGLImageUsageTests, SampleR8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); uint8_t data[2] = {0x42, 0x42}; ScopedEGLImage eglImage = CreateEGLImage(2, 1, GL_R8, GL_RED, GL_UNSIGNED_BYTE, data); @@ -488,8 +488,8 @@ // Test sampling an imported RG8 GL texture TEST_P(EGLImageUsageTests, SampleRG8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); uint16_t data[2] = {0x4221, 0x4221}; ScopedEGLImage eglImage = CreateEGLImage(2, 1, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, data); @@ -498,8 +498,8 @@ // Test sampling an imported RGBA8 GL texture TEST_P(EGLImageUsageTests, SampleRGBA8EGLImage) { - // TODO(crbug.com/40238674): Fails on Pixel 10 gles. - DAWN_SUPPRESS_TEST_IF(IsImgTec() && IsOpenGLES()); + // TODO(crbug.com/40238674): Fails on Pixel 10. + DAWN_SUPPRESS_TEST_IF(IsImgTec()); uint32_t data[2] = {0x48844221, 0x48844221}; ScopedEGLImage eglImage = CreateEGLImage(2, 1, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, data);