From 318ec2e89318e093954e81cb96205a7089fd50f2 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Tue, 30 Mar 2021 20:14:07 +0000 Subject: [PATCH] Disable test for D3D12 + tint which use runtime sized arrays Bug: tint:682 Change-Id: I254e0a4b02dd9348daab096e6fc16d9a004c527e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46369 Commit-Queue: Ben Clayton Reviewed-by: Corentin Wallez --- src/tests/end2end/BufferZeroInitTests.cpp | 3 +++ src/tests/end2end/ComputeCopyStorageBufferTests.cpp | 3 +++ src/tests/end2end/CopyTextureForBrowserTests.cpp | 3 +++ src/tests/end2end/OpArrayLengthTests.cpp | 3 +++ src/tests/end2end/QueryTests.cpp | 3 +++ src/tests/white_box/QueryInternalShaderTests.cpp | 2 ++ 6 files changed, 17 insertions(+) diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp index da478b4829..f24052cc7e 100644 --- a/src/tests/end2end/BufferZeroInitTests.cpp +++ b/src/tests/end2end/BufferZeroInitTests.cpp @@ -1186,6 +1186,9 @@ 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 + DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); + // Timestamp query is not supported on OpenGL DAWN_SKIP_TEST_IF(IsOpenGL()); diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index bbda58f34e..cb346f5289 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -141,6 +141,9 @@ 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 d5ce4dd8fc..33df4a0441 100644 --- a/src/tests/end2end/CopyTextureForBrowserTests.cpp +++ b/src/tests/end2end/CopyTextureForBrowserTests.cpp @@ -93,6 +93,9 @@ 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 45bac0deb0..b7eb7c387d 100644 --- a/src/tests/end2end/OpArrayLengthTests.cpp +++ b/src/tests/end2end/OpArrayLengthTests.cpp @@ -23,6 +23,9 @@ 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 a60213a3ac..e69ba92405 100644 --- a/src/tests/end2end/QueryTests.cpp +++ b/src/tests/end2end/QueryTests.cpp @@ -314,6 +314,9 @@ class TimestampQueryTests : public QueryTests { 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")); + // Skip all tests if timestamp extension is not supported DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"})); } diff --git a/src/tests/white_box/QueryInternalShaderTests.cpp b/src/tests/white_box/QueryInternalShaderTests.cpp index c6ffbe3c2d..5b61744521 100644 --- a/src/tests/white_box/QueryInternalShaderTests.cpp +++ b/src/tests/white_box/QueryInternalShaderTests.cpp @@ -86,6 +86,8 @@ 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 + 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());