From 3a3952c4f5924c4a76add45c13b265441d60f864 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Fri, 18 Jun 2021 08:52:12 +0000 Subject: [PATCH] Suppress ShaderRobustnessPerf when using Tint + FXC Also tighten previous suppressions to only apply when using the Tint generator. TBR=bclayton@google.com Bug: tint:904 Change-Id: I22210227c428eb38901904966ec2c3bd70ce607b Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/55200 Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez --- src/tests/end2end/VertexFormatTests.cpp | 2 +- src/tests/perf_tests/ShaderRobustnessPerf.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tests/end2end/VertexFormatTests.cpp b/src/tests/end2end/VertexFormatTests.cpp index 1563a8318a..e7351422cf 100644 --- a/src/tests/end2end/VertexFormatTests.cpp +++ b/src/tests/end2end/VertexFormatTests.cpp @@ -53,7 +53,7 @@ class VertexFormatTest : public DawnTest { DAWN_SUPPRESS_TEST_IF(IsMetal() && IsIntel()); // TODO(crbug.com/tint/904): FXC emits bad output for this test - DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC()); + DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator")); renderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize); } diff --git a/src/tests/perf_tests/ShaderRobustnessPerf.cpp b/src/tests/perf_tests/ShaderRobustnessPerf.cpp index ffcce8af0e..b180bc5e23 100644 --- a/src/tests/perf_tests/ShaderRobustnessPerf.cpp +++ b/src/tests/perf_tests/ShaderRobustnessPerf.cpp @@ -409,6 +409,9 @@ void ShaderRobustnessPerf::SetUp() { // TODO(crbug.com/dawn/786): D3D12_Microsoft_Basic_Render_Driver_CPU DAWN_SUPPRESS_TEST_IF(IsD3D12() && IsWARP()); + // TODO(crbug.com/tint/904): FXC emits bad output for this test + DAWN_SUPPRESS_TEST_IF(IsD3D12() && !IsDXC() && HasToggleEnabled("use_tint_generator")); + const size_t dataASize = mDimAOuter * mDimInner; std::vector dataA(dataASize); uint64_t byteASize = sizeof(float) * dataA.size();