From b06b89e9c2d067f99268c47958f676ab6a724192 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 12 Apr 2021 18:45:14 +0000 Subject: [PATCH] Reenable D3D12 tests that failed with 'runtime array not supported yet' Replace TODOs for those tests that now fail with another issue. Fixed: tint:682 Change-Id: I2665f0d4f495e4efc5adef4cf46a965df7c8936c Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46451 Auto-Submit: Ben Clayton Commit-Queue: Austin Eng Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng --- src/tests/end2end/BufferZeroInitTests.cpp | 2 +- src/tests/end2end/ComputeCopyStorageBufferTests.cpp | 3 --- src/tests/end2end/CopyTextureForBrowserTests.cpp | 3 --- src/tests/end2end/OpArrayLengthTests.cpp | 3 --- src/tests/end2end/QueryTests.cpp | 2 +- src/tests/white_box/QueryInternalShaderTests.cpp | 2 +- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp index f24052cc7e..b91d02937e 100644 --- a/src/tests/end2end/BufferZeroInitTests.cpp +++ b/src/tests/end2end/BufferZeroInitTests.cpp @@ -1186,7 +1186,7 @@ TEST_P(BufferZeroInitTest, IndirectBufferForDispatchIndirect) { // Test the buffer will be lazily initialized correctly when its first use is in resolveQuerySet TEST_P(BufferZeroInitTest, ResolveQuerySet) { - // TODO(crbug.com/tint/682): error: runtime array not supported yet + // TODO(crbug.com/tint/683): internal compiler error: TINT_UNIMPLEMENTED DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); // Timestamp query is not supported on OpenGL diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index cb346f5289..bbda58f34e 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -141,9 +141,6 @@ TEST_P(ComputeCopyStorageBufferTests, SizedArrayOfStruct) { // Test that a trivial compute-shader memcpy implementation works. TEST_P(ComputeCopyStorageBufferTests, UnsizedArrayOfBasic) { - // TODO(crbug.com/tint/682): error: runtime array not supported yet - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - BasicTest(R"( [[block]] struct Buf1 { s : array>; diff --git a/src/tests/end2end/CopyTextureForBrowserTests.cpp b/src/tests/end2end/CopyTextureForBrowserTests.cpp index 8f838fdfea..86892805c0 100644 --- a/src/tests/end2end/CopyTextureForBrowserTests.cpp +++ b/src/tests/end2end/CopyTextureForBrowserTests.cpp @@ -113,9 +113,6 @@ class CopyTextureForBrowserTests : public DawnTest { void SetUp() override { DawnTest::SetUp(); - // TODO(crbug.com/tint/682): error: runtime array not supported yet - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - testPipeline = MakeTestPipeline(); uint32_t uniformBufferData[] = { diff --git a/src/tests/end2end/OpArrayLengthTests.cpp b/src/tests/end2end/OpArrayLengthTests.cpp index cebe3f92a3..a936e084cb 100644 --- a/src/tests/end2end/OpArrayLengthTests.cpp +++ b/src/tests/end2end/OpArrayLengthTests.cpp @@ -23,9 +23,6 @@ class OpArrayLengthTest : public DawnTest { void SetUp() { DawnTest::SetUp(); - // TODO(crbug.com/tint/682): error: runtime array not supported yet - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - // Create buffers of various size to check the length() implementation wgpu::BufferDescriptor bufferDesc; bufferDesc.size = 4; diff --git a/src/tests/end2end/QueryTests.cpp b/src/tests/end2end/QueryTests.cpp index 8537c539b6..daf6e4baa6 100644 --- a/src/tests/end2end/QueryTests.cpp +++ b/src/tests/end2end/QueryTests.cpp @@ -512,7 +512,7 @@ class TimestampQueryTests : public QueryTests { void SetUp() override { DawnTest::SetUp(); - // TODO(crbug.com/tint/682): error: runtime array not supported yet + // TODO(crbug.com/tint/683): internal compiler error: TINT_UNIMPLEMENTED DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); // Skip all tests if timestamp extension is not supported diff --git a/src/tests/white_box/QueryInternalShaderTests.cpp b/src/tests/white_box/QueryInternalShaderTests.cpp index 5b61744521..7baff77277 100644 --- a/src/tests/white_box/QueryInternalShaderTests.cpp +++ b/src/tests/white_box/QueryInternalShaderTests.cpp @@ -86,7 +86,7 @@ class QueryInternalShaderTests : public DawnTest {}; // timestamp period (here use GPU frequency (HZ) on Intel D3D12 to calculate the period in // ns for testing). TEST_P(QueryInternalShaderTests, TimestampComputeShader) { - // TODO(crbug.com/tint/682): error: runtime array not supported yet + // TODO(crbug.com/tint/683): internal compiler error: TINT_UNIMPLEMENTED DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); // TODO(crbug.com/dawn/741): Test output is wrong with D3D12 + WARP. DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP());