diff --git a/src/dawn/tests/end2end/TextureZeroInitTests.cpp b/src/dawn/tests/end2end/TextureZeroInitTests.cpp index a7d3c6ce50..4048a34713 100644 --- a/src/dawn/tests/end2end/TextureZeroInitTests.cpp +++ b/src/dawn/tests/end2end/TextureZeroInitTests.cpp @@ -709,14 +709,11 @@ TEST_P(TextureZeroInitTest, IndependentDepthStencilLoadAfterDiscard) { EXPECT_EQ(true, native::IsTextureSubresourceInitialized(depthStencilTexture.Get(), 0, 1, 0, 1, WGPUTextureAspect_StencilOnly)); - // TODO(crbug.com/dawn/439): Implement stencil copies on other platforms - if (IsMetal() || IsVulkan() || IsD3D12()) { - // Check by copy that the stencil data is 2. - std::vector expected(kSize * kSize, 2); - EXPECT_LAZY_CLEAR( - 0u, EXPECT_TEXTURE_EQ(expected.data(), depthStencilTexture, {0, 0}, {kSize, kSize}, - 0, wgpu::TextureAspect::StencilOnly)); - } + // Check by copy that the stencil data is 2. + std::vector expected(kSize * kSize, 2); + EXPECT_LAZY_CLEAR( + 0u, EXPECT_TEXTURE_EQ(expected.data(), depthStencilTexture, {0, 0}, {kSize, kSize}, 0, + wgpu::TextureAspect::StencilOnly)); } // Uninitialize only stencil @@ -783,8 +780,8 @@ TEST_P(TextureZeroInitTest, IndependentDepthStencilLoadAfterDiscard) { EXPECT_EQ(true, native::IsTextureSubresourceInitialized(depthStencilTexture.Get(), 0, 1, 0, 1, WGPUTextureAspect_StencilOnly)); - // TODO(crbug.com/dawn/439): Implement stencil copies on other platforms - if (IsMetal() || IsVulkan() || IsD3D12()) { + // TODO(chromium:42241686): Fail on the Android devices using Mali GPUs (e.g. Pixel 6). + if (!(IsAndroid() && IsARM())) { // Check by copy that the stencil data is 0. std::vector expected(kSize * kSize, 0); EXPECT_LAZY_CLEAR( @@ -914,9 +911,6 @@ TEST_P(TextureZeroInitTest, StencilCopyThenDiscardAndCopyToTextureThenReadByCopy // Test that clear state is tracked independently for depth/stencil textures. // Lazy clear of the stencil aspect via copy should not touch depth. TEST_P(TextureZeroInitTest, IndependentDepthStencilCopyAfterDiscard) { - // TODO(crbug.com/dawn/439): Implement stencil copies on other platforms - DAWN_SUPPRESS_TEST_IF(!(IsMetal() || IsVulkan() || IsD3D12())); - // TODO(dawn:1549) Fails on Qualcomm-based Android devices. DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm());