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>
This commit is contained in:
Ben Clayton 2021-06-25 15:44:02 +00:00 committed by Dawn LUCI CQ
parent 2c460f9f2f
commit 448e1e91a7
1 changed files with 4 additions and 3 deletions

View File

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