commit 5ce6472b1ec7846b9244f87d05958fdd6fe8cc7c
author Corentin Wallez <cwallez@chromium.org> Fri Apr 09 12:08:18 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Apr 09 12:08:18 2021 +0000
tree 1883098ec7a5e78c888a525878144083b927d58f
parent 59f2038dce0e7636c7afe8b922d025a05767a5e1

Fix D3D12 Sampler Heap tests to reference their bindings in WGSL

Tint only reflects the bindings that are statically used so before this
fix it would produce an empty pipeline layout. Fix this by statically
referencing the sampler binding in the shader.

Fixed: dawn:754
Change-Id: I381acd9adb7d1e80ccf0642b5189750a5a43de25
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/47420
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/tests/white_box/D3D12DescriptorHeapTests.cpp

diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index 4f67ca7..5bca80a 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -171,9 +171,6 @@
 
 // Verify the shader visible sampler heaps does not switch over within a single submit.
 TEST_P(D3D12DescriptorHeapTests, NoSwitchOverSamplerHeap) {
-    // TODO(crbug.com/tint/704): Fails for D3D12 with use_tint_generator
-    DAWN_SKIP_TEST_IF(IsD3D12() && HasToggleEnabled("use_tint_generator"));
-
     utils::ComboRenderPipelineDescriptor2 renderPipelineDescriptor;
 
     // Fill in a sampler heap with "sampler only" bindgroups (1x sampler per group) by creating a
@@ -181,14 +178,15 @@
     // because the sampler heap allocations are de-duplicated.
     renderPipelineDescriptor.vertex.module = utils::CreateShaderModule(device, R"(
             [[builtin(position)]] var<out> Position : vec4<f32>;
-            [[stage(vertex)]] fn main() -> void {
+            [[stage(vertex)]] fn main() {
                 Position = vec4<f32>(0.0, 0.0, 0.0, 1.0);
             })");
 
     renderPipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"(
             [[location(0)]] var<out> FragColor : vec4<f32>;
             [[group(0), binding(0)]] var sampler0 : sampler;
-            [[stage(fragment)]] fn main() -> void {
+            [[stage(fragment)]] fn main() {
+                let referenceSampler : sampler = sampler0;
                 FragColor = vec4<f32>(0.0, 0.0, 0.0, 0.0);
             })");