From 36dcb1a51a1de5219e4e468789ba0eaf2bedd163 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Thu, 25 Feb 2021 16:17:31 +0000 Subject: [PATCH] Un-skip use_tint_generator tests using runtime arrays This is using the Tint -> SPIRV-Cross path, but Tint supports the SPIR-V part now, so it works correctly in Dawn's tests. Bug: tint:400 Change-Id: I6efd9447a9b454fb866467d65fda9350ec772f18 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/42560 Reviewed-by: Corentin Wallez Reviewed-by: Ben Clayton Commit-Queue: Austin Eng --- src/tests/end2end/BufferZeroInitTests.cpp | 4 ---- src/tests/end2end/QueryTests.cpp | 4 ---- src/tests/white_box/QueryInternalShaderTests.cpp | 4 ---- 3 files changed, 12 deletions(-) diff --git a/src/tests/end2end/BufferZeroInitTests.cpp b/src/tests/end2end/BufferZeroInitTests.cpp index 7fe24a8ed0..089fa5a7c0 100644 --- a/src/tests/end2end/BufferZeroInitTests.cpp +++ b/src/tests/end2end/BufferZeroInitTests.cpp @@ -1212,10 +1212,6 @@ TEST_P(BufferZeroInitTest, ResolveQuerySet) { // Skip if timestamp extension is not supported on device DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"})); - // TODO(crbug.com/tint/255, crbug.com/tint/256, crbug.com/tint/400, crbug.com/tint/417): - // Skip due to runtime array not currently supported in WGSL - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - constexpr uint64_t kBufferSize = 16u; constexpr wgpu::BufferUsage kBufferUsage = wgpu::BufferUsage::QueryResolve | wgpu::BufferUsage::CopyDst; diff --git a/src/tests/end2end/QueryTests.cpp b/src/tests/end2end/QueryTests.cpp index e1d7c1de07..887d89ec8d 100644 --- a/src/tests/end2end/QueryTests.cpp +++ b/src/tests/end2end/QueryTests.cpp @@ -319,10 +319,6 @@ class TimestampQueryTests : public QueryTests { // Skip all tests if timestamp extension is not supported DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"})); - - // TODO(crbug.com/tint/255, crbug.com/tint/256, crbug.com/tint/400, crbug.com/tint/417): - // Skip use_tint_generator due to runtime array not supported in WGSL - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); } std::vector GetRequiredExtensions() override { diff --git a/src/tests/white_box/QueryInternalShaderTests.cpp b/src/tests/white_box/QueryInternalShaderTests.cpp index 29a417ea8b..e0ad381713 100644 --- a/src/tests/white_box/QueryInternalShaderTests.cpp +++ b/src/tests/white_box/QueryInternalShaderTests.cpp @@ -88,10 +88,6 @@ class QueryInternalShaderTests : public DawnTest {}; TEST_P(QueryInternalShaderTests, TimestampComputeShader) { DAWN_SKIP_TEST_IF(UsesWire()); - // TODO(crbug.com/tint/255, crbug.com/tint/256, crbug.com/tint/400, crbug.com/tint/417): - // There is no builtin support for doing the runtime array. - DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); - constexpr uint32_t kTimestampCount = 10u; // A gpu frequency on Intel D3D12 (ticks/second) constexpr uint64_t kGPUFrequency = 12000048u;