From 51edb2b2d0ede5603432bc6b7f41f6ebc46370a9 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 12 Apr 2021 17:41:23 +0000 Subject: [PATCH] Reenable D3D12 tests that use workgroup storage Now fixed. Fixed: tint:688 Change-Id: Ic1fcd487e5fc242dc150e9db1a163c2af07c6f09 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46449 Commit-Queue: Austin Eng Auto-Submit: Ben Clayton Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng --- src/tests/end2end/ComputeSharedMemoryTests.cpp | 7 ------- src/tests/end2end/ObjectCachingTests.cpp | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/tests/end2end/ComputeSharedMemoryTests.cpp b/src/tests/end2end/ComputeSharedMemoryTests.cpp index 2d601482b6..2bc4d61fa6 100644 --- a/src/tests/end2end/ComputeSharedMemoryTests.cpp +++ b/src/tests/end2end/ComputeSharedMemoryTests.cpp @@ -22,13 +22,6 @@ class ComputeSharedMemoryTests : public DawnTest { public: static constexpr uint32_t kInstances = 11; - void SetUp() override { - DawnTest::SetUp(); - - // TODO(crbug.com/tint/688): error: undeclared identifier '_tint_7' - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - } - void BasicTest(const char* shader); }; diff --git a/src/tests/end2end/ObjectCachingTests.cpp b/src/tests/end2end/ObjectCachingTests.cpp index ce8758c5b2..bf233b7208 100644 --- a/src/tests/end2end/ObjectCachingTests.cpp +++ b/src/tests/end2end/ObjectCachingTests.cpp @@ -17,15 +17,7 @@ #include "utils/ComboRenderPipelineDescriptor.h" #include "utils/WGPUHelpers.h" -class ObjectCachingTest : public DawnTest { - protected: - void SetUp() override { - DawnTest::SetUp(); - - // TODO(crbug.com/tint/688): error: undeclared identifier '_tint_7' - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - } -}; +class ObjectCachingTest : public DawnTest {}; // Test that BindGroupLayouts are correctly deduplicated. TEST_P(ObjectCachingTest, BindGroupLayoutDeduplication) {