From 10ec9a706fdef5a74b8923d0011e94e9cc6afb11 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 12 Apr 2021 18:41:54 +0000 Subject: [PATCH] Reenable D3D12 texture tests with tint generator Issues now resolved Fixed: tint:684 Fixed: tint:689 Fixed: tint:690 Fixed: tint:691 Change-Id: Ib348ed52a17538a023fdd3c8f2cd0c2d847a09ad Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/47427 Auto-Submit: Ben Clayton Commit-Queue: Austin Eng Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng --- src/tests/end2end/DepthStencilSamplingTests.cpp | 3 --- src/tests/end2end/SamplerFilterAnisotropicTests.cpp | 2 -- src/tests/end2end/StorageTextureTests.cpp | 3 --- src/tests/end2end/TextureFormatTests.cpp | 7 ------- 4 files changed, 15 deletions(-) diff --git a/src/tests/end2end/DepthStencilSamplingTests.cpp b/src/tests/end2end/DepthStencilSamplingTests.cpp index d62e471a8f..d0906de100 100644 --- a/src/tests/end2end/DepthStencilSamplingTests.cpp +++ b/src/tests/end2end/DepthStencilSamplingTests.cpp @@ -57,9 +57,6 @@ class DepthStencilSamplingTest : public DawnTest { void SetUp() override { DawnTest::SetUp(); - // TODO(crbug.com/tint/684): Shaders compile, tests fail. - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - wgpu::BufferDescriptor uniformBufferDesc; uniformBufferDesc.usage = wgpu::BufferUsage::Uniform | wgpu::BufferUsage::CopyDst; uniformBufferDesc.size = sizeof(float); diff --git a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp index 3e69983d8d..c946697b80 100644 --- a/src/tests/end2end/SamplerFilterAnisotropicTests.cpp +++ b/src/tests/end2end/SamplerFilterAnisotropicTests.cpp @@ -268,8 +268,6 @@ class SamplerFilterAnisotropicTest : public DawnTest { }; TEST_P(SamplerFilterAnisotropicTest, SlantedPlaneMipmap) { - // TODO(crbug.com/tint/691): shader compiles, but output is unexpected - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); // TODO(crbug.com/dawn/740): Test output is wrong with D3D12 + WARP. DAWN_SKIP_TEST_IF(IsD3D12() && IsWARP()); diff --git a/src/tests/end2end/StorageTextureTests.cpp b/src/tests/end2end/StorageTextureTests.cpp index 9c68f3508d..0ffcef0f85 100644 --- a/src/tests/end2end/StorageTextureTests.cpp +++ b/src/tests/end2end/StorageTextureTests.cpp @@ -1049,9 +1049,6 @@ TEST_P(StorageTextureTests, ReadonlyAndWriteonlyStorageTexturePingPong) { // Test that multiple dispatches to increment values by ping-ponging between a sampled texture and // a write-only storage texture are synchronized in one pass. TEST_P(StorageTextureTests, SampledAndWriteonlyStorageTexturePingPong) { - // TODO(crbug.com/tint/690): shaders compile, but output is unexpected - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - constexpr wgpu::TextureFormat kTextureFormat = wgpu::TextureFormat::R32Uint; wgpu::Texture storageTexture1 = CreateTexture( kTextureFormat, diff --git a/src/tests/end2end/TextureFormatTests.cpp b/src/tests/end2end/TextureFormatTests.cpp index 0fa1781f40..efbad7d9e8 100644 --- a/src/tests/end2end/TextureFormatTests.cpp +++ b/src/tests/end2end/TextureFormatTests.cpp @@ -113,13 +113,6 @@ class ExpectFloat16 : public detail::Expectation { class TextureFormatTest : public DawnTest { protected: - void SetUp() { - DawnTest::SetUp(); - - // TODO(crbug.com/tint/689): shaders compile, but produces unexpected output. - DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator")); - } - // Structure containing all the information that tests need to know about the format. struct FormatTestInfo { wgpu::TextureFormat format;