commit 27b0162b96a8bb31db00d6ee5389a24f3f65b4d4
author Austin Eng <enga@chromium.org> Mon Jun 28 21:18:40 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 28 21:18:40 2021 +0000
tree 6ab951c66b7733793ed0a0432d22a8102dc33b50
parent 0db69f005265becb069d86eebf16cd85e98e2e47

Remove explicit test instantiation with use_tint_generator

We're migrating to run all tests with both Tint and SPIRV-Cross.
Remove explicitly instantiating only with Tint, and add
skips for tests that will not work if use_tint_generator is not
enabled.

Bug: dawn:571
Change-Id: I8322dec688e75b6efa8c4f18c6b9439a2e325631
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/56261
Auto-Submit: Austin Eng <enga@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>

src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp

diff --git a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
index c7e854f..b1d3c5c 100644
--- a/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
+++ b/src/tests/end2end/ComputeLayoutMemoryBufferTests.cpp
@@ -132,7 +132,13 @@
 DAWN_TEST_PARAM_STRUCT(ComputeLayoutMemoryBufferTestParams, StorageClass, Field)
 
 class ComputeLayoutMemoryBufferTests
-    : public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {};
+    : public DawnTestWithParams<ComputeLayoutMemoryBufferTestParams> {
+    void SetUp() override {
+        DawnTestBase::SetUp();
+        DAWN_TEST_UNSUPPORTED_IF((IsD3D12() || IsMetal()) &&
+                                 !HasToggleEnabled("use_tint_generator"));
+    }
+};
 
 TEST_P(ComputeLayoutMemoryBufferTests, Fields) {
     // Sentinel value markers codes used to check that the start and end of
@@ -342,8 +348,7 @@
     auto GenerateParams() {
         auto params = MakeParamGenerator<ComputeLayoutMemoryBufferTestParams>(
             {
-                D3D12Backend({"use_tint_generator"}), MetalBackend({"use_tint_generator"}),
-                VulkanBackend(),
+                D3D12Backend(), MetalBackend(), VulkanBackend(),
                 // TODO(crbug.com/dawn/942)
                 // There was a compiler error: Buffer block cannot be expressed as any of std430,
                 // std140, scalar, even with enhanced layouts. You can try flattening this block to

src/tests/end2end/FirstIndexOffsetTests.cpp

diff --git a/src/tests/end2end/FirstIndexOffsetTests.cpp b/src/tests/end2end/FirstIndexOffsetTests.cpp
index 506c0d3..b3c6481 100644
--- a/src/tests/end2end/FirstIndexOffsetTests.cpp
+++ b/src/tests/end2end/FirstIndexOffsetTests.cpp
@@ -48,6 +48,7 @@
   protected:
     void SetUp() override {
         DawnTest::SetUp();
+        DAWN_TEST_UNSUPPORTED_IF(IsD3D12() && !HasToggleEnabled("use_tint_generator"));
 
         // WGSL doesn't have the ability to tag attributes as "flat". "flat" is required on u32
         // attributes for correct runtime behavior under Vulkan and codegen under OpenGL(ES).
@@ -219,7 +220,7 @@
 }
 
 DAWN_INSTANTIATE_TEST(FirstIndexOffsetTests,
-                      D3D12Backend({"use_tint_generator"}),
+                      D3D12Backend(),
                       MetalBackend(),
                       OpenGLBackend(),
                       OpenGLESBackend(),