From 1b42ad94bab736417c70bafb54647e3e438eedce Mon Sep 17 00:00:00 2001 From: Stephen White Date: Thu, 28 Jan 2021 21:11:17 +0000 Subject: [PATCH] Revert "Moar testing on OpenGL ES backend." This reverts commit 7bfb3ed2c6dccfa209b5896e263e1bdd63922aa2. Reason for revert: Still failing some zero init tests Original change's description: > Moar testing on OpenGL ES backend. > > This CL enables the GLES backend on all the remaining tests for which > the desktop OpenGL backend is enabled. > > Bug: dawn:580 > Change-Id: Iab0d13299d58d17749a3405d25d27da7ba4077fa > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39320 > Reviewed-by: Corentin Wallez > Reviewed-by: Austin Eng > Commit-Queue: Stephen White TBR=cwallez@chromium.org,senorblanco@chromium.org,enga@chromium.org Change-Id: I37bb1438107151f11617e67287fe9f5e0e22fd21 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: dawn:580 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39361 Reviewed-by: Stephen White Commit-Queue: Stephen White --- src/tests/end2end/BufferTests.cpp | 2 -- src/tests/end2end/BufferZeroInitTests.cpp | 1 - src/tests/end2end/IndexFormatTests.cpp | 2 -- src/tests/end2end/NonzeroBufferCreationTests.cpp | 2 -- src/tests/end2end/NonzeroTextureCreationTests.cpp | 2 -- src/tests/end2end/StorageTextureTests.cpp | 1 - src/tests/end2end/TextureZeroInitTests.cpp | 1 - src/tests/end2end/VertexFormatTests.cpp | 1 - src/tests/end2end/VertexStateTests.cpp | 2 -- 9 files changed, 14 deletions(-) diff --git a/src/tests/end2end/BufferTests.cpp b/src/tests/end2end/BufferTests.cpp index 50225c4130..82b26ba745 100644 --- a/src/tests/end2end/BufferTests.cpp +++ b/src/tests/end2end/BufferTests.cpp @@ -437,7 +437,6 @@ DAWN_INSTANTIATE_TEST(BufferMappingTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); class BufferMappedAtCreationTests : public DawnTest { @@ -692,7 +691,6 @@ DAWN_INSTANTIATE_TEST(BufferMappedAtCreationTests, D3D12Backend({}, {"use_d3d12_resource_heap_tier2"}), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); class BufferTests : public DawnTest {}; diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp index cc0b845c96..258d75d47e 100644 --- a/src/tests/end2end/BufferZeroInitTests.cpp +++ b/src/tests/end2end/BufferZeroInitTests.cpp @@ -1248,5 +1248,4 @@ DAWN_INSTANTIATE_TEST(BufferZeroInitTest, D3D12Backend({"nonzero_clear_resources_on_creation_for_testing"}), MetalBackend({"nonzero_clear_resources_on_creation_for_testing"}), OpenGLBackend({"nonzero_clear_resources_on_creation_for_testing"}), - OpenGLESBackend({"nonzero_clear_resources_on_creation_for_testing"}), VulkanBackend({"nonzero_clear_resources_on_creation_for_testing"})); diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp index 711a314965..252ad636dc 100644 --- a/src/tests/end2end/IndexFormatTests.cpp +++ b/src/tests/end2end/IndexFormatTests.cpp @@ -481,11 +481,9 @@ DAWN_INSTANTIATE_TEST(TriangleStripPrimitiveRestartTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); DAWN_INSTANTIATE_TEST(LineStripPrimitiveRestartTests, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/NonzeroBufferCreationTests.cpp b/src/tests/end2end/NonzeroBufferCreationTests.cpp index f60bcfe700..25e84b6367 100644 --- a/src/tests/end2end/NonzeroBufferCreationTests.cpp +++ b/src/tests/end2end/NonzeroBufferCreationTests.cpp @@ -135,7 +135,5 @@ DAWN_INSTANTIATE_TEST(NonzeroBufferCreationTests, {"lazy_clear_resource_on_first_use"}), OpenGLBackend({"nonzero_clear_resources_on_creation_for_testing"}, {"lazy_clear_resource_on_first_use"}), - OpenGLESBackend({"nonzero_clear_resources_on_creation_for_testing"}, - {"lazy_clear_resource_on_first_use"}), VulkanBackend({"nonzero_clear_resources_on_creation_for_testing"}, {"lazy_clear_resource_on_first_use"})); diff --git a/src/tests/end2end/NonzeroTextureCreationTests.cpp b/src/tests/end2end/NonzeroTextureCreationTests.cpp index b08e44651b..efb301bd10 100644 --- a/src/tests/end2end/NonzeroTextureCreationTests.cpp +++ b/src/tests/end2end/NonzeroTextureCreationTests.cpp @@ -293,7 +293,5 @@ DAWN_INSTANTIATE_TEST(NonzeroTextureCreationTests, {"lazy_clear_resource_on_first_use"}), OpenGLBackend({"nonzero_clear_resources_on_creation_for_testing"}, {"lazy_clear_resource_on_first_use"}), - OpenGLESBackend({"nonzero_clear_resources_on_creation_for_testing"}, - {"lazy_clear_resource_on_first_use"}), VulkanBackend({"nonzero_clear_resources_on_creation_for_testing"}, {"lazy_clear_resource_on_first_use"})); diff --git a/src/tests/end2end/StorageTextureTests.cpp b/src/tests/end2end/StorageTextureTests.cpp index 19ad706729..04c2da4c26 100644 --- a/src/tests/end2end/StorageTextureTests.cpp +++ b/src/tests/end2end/StorageTextureTests.cpp @@ -1243,6 +1243,5 @@ TEST_P(StorageTextureZeroInitTests, WriteonlyStorageTextureClearsToZeroInCompute DAWN_INSTANTIATE_TEST(StorageTextureZeroInitTests, D3D12Backend({"nonzero_clear_resources_on_creation_for_testing"}), OpenGLBackend({"nonzero_clear_resources_on_creation_for_testing"}), - OpenGLESBackend({"nonzero_clear_resources_on_creation_for_testing"}), MetalBackend({"nonzero_clear_resources_on_creation_for_testing"}), VulkanBackend({"nonzero_clear_resources_on_creation_for_testing"})); diff --git a/src/tests/end2end/TextureZeroInitTests.cpp b/src/tests/end2end/TextureZeroInitTests.cpp index a98f9235ed..3cce07c91e 100644 --- a/src/tests/end2end/TextureZeroInitTests.cpp +++ b/src/tests/end2end/TextureZeroInitTests.cpp @@ -1687,7 +1687,6 @@ DAWN_INSTANTIATE_TEST(TextureZeroInitTest, D3D12Backend({"nonzero_clear_resources_on_creation_for_testing"}, {"use_d3d12_render_pass"}), OpenGLBackend({"nonzero_clear_resources_on_creation_for_testing"}), - OpenGLESBackend({"nonzero_clear_resources_on_creation_for_testing"}), MetalBackend({"nonzero_clear_resources_on_creation_for_testing"}), VulkanBackend({"nonzero_clear_resources_on_creation_for_testing"})); diff --git a/src/tests/end2end/VertexFormatTests.cpp b/src/tests/end2end/VertexFormatTests.cpp index 750f0e333c..d3731ebea2 100644 --- a/src/tests/end2end/VertexFormatTests.cpp +++ b/src/tests/end2end/VertexFormatTests.cpp @@ -924,5 +924,4 @@ DAWN_INSTANTIATE_TEST(VertexFormatTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); diff --git a/src/tests/end2end/VertexStateTests.cpp b/src/tests/end2end/VertexStateTests.cpp index 7cef42d7ee..72d18bafe8 100644 --- a/src/tests/end2end/VertexStateTests.cpp +++ b/src/tests/end2end/VertexStateTests.cpp @@ -617,7 +617,6 @@ DAWN_INSTANTIATE_TEST(VertexStateTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend()); // TODO for the input state: @@ -676,5 +675,4 @@ DAWN_INSTANTIATE_TEST(OptionalVertexStateTest, D3D12Backend(), MetalBackend(), OpenGLBackend(), - OpenGLESBackend(), VulkanBackend());