commit 448e1e91a70ed07ecc4334cbe434f65235b24b86
author Ben Clayton <bclayton@google.com> Fri Jun 25 15:44:02 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 25 15:44:02 2021 +0000
tree 2e8cbf854167c3d0a5422b36086abba7cddd823b
parent 2c460f9f2f37a5deb5861bb99ffc4f2481ec1515

D3D12: Reenable EncodeManyUBOAndSamplers test

Tint has rolled, so this test can be re-enabled.

SPIRV-Cross produces bad results - likely the UBO layout for mat2x2 is
incorrectly padded - so this test is suppressed for !UseTintGenerator.

Fixed: dawn:946
Change-Id: If1d030314f51759e6a2a00dd8edc2597efb1eb4a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/55440
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/tests/white_box/D3D12DescriptorHeapTests.cpp

diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index d0114e4..c55cda9 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -736,9 +736,10 @@
 
 // Verify encoding many sampler and ubo worth of bindgroups.
 // Shader-visible heaps should switch out |kNumOfViewHeaps| times.
-// TODO(crbug.com/dawn/946): This test is currently disabled because the UBO
-// layout is incorrect. Reenable after next tint roll.
-TEST_P(D3D12DescriptorHeapTests, DISABLED_EncodeManyUBOAndSamplers) {
+TEST_P(D3D12DescriptorHeapTests, EncodeManyUBOAndSamplers) {
+    // TODO(crbug.com/dawn/571): HLSL emission via SPIRV-Cross produces incorrect results.
+    DAWN_TEST_UNSUPPORTED_IF(!HasToggleEnabled("use_tint_generator"));
+
     DAWN_TEST_UNSUPPORTED_IF(!mD3DDevice->IsToggleEnabled(
         dawn_native::Toggle::UseD3D12SmallShaderVisibleHeapForTesting));