commit ce1539519016745e7ff45fd5ec37ace80d27913b
author Austin Eng <enga@chromium.org> Tue Jul 27 07:51:26 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 27 07:51:26 2021 +0000
tree 24fe9c5b127ef46937fdeef1cbdec93e84192366
parent 6e5b08054755dc92f1559b46620d4a9635205c0a

Fix WGSL usage of "let"

Bug: none
Change-Id: If2e1617bc17192880aff88d8f4a52315be593553
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59880
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp

diff --git a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
index 4515a24..7fddcea 100644
--- a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
+++ b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp
@@ -387,7 +387,7 @@
             [[group(0), binding(0)]] var mySampler: sampler;
 
             [[stage(fragment)]] fn main() {
-                let s : sampler = mySampler;
+                ignore(mySampler);
             })");
         EXPECT_EQ(device.CreateBindGroupLayout(&desc).Get(), pipeline.GetBindGroupLayout(0).Get());
     }
@@ -753,7 +753,7 @@
     wgpu::ShaderModule vsModuleSampler = utils::CreateShaderModule(device, R"(
         [[group(0), binding(0)]] var mySampler: sampler;
         [[stage(vertex)]] fn main() -> [[builtin(position)]] vec4<f32> {
-            let s : sampler = mySampler;
+            ignore(mySampler);
             return vec4<f32>();
         })");
 
@@ -764,7 +764,7 @@
     wgpu::ShaderModule fsModuleSampler = utils::CreateShaderModule(device, R"(
         [[group(0), binding(0)]] var mySampler: sampler;
         [[stage(fragment)]] fn main() {
-            let s : sampler = mySampler;
+            ignore(mySampler);
         })");
 
     // Create BGLs with minBufferBindingSize 4 and 64.

src/tests/white_box/D3D12DescriptorHeapTests.cpp

diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index fec3550..8d957af 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -183,7 +183,7 @@
     renderPipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"(
             [[group(0), binding(0)]] var sampler0 : sampler;
             [[stage(fragment)]] fn main() -> [[location(0)]] vec4<f32> {
-                let referenceSampler : sampler = sampler0;
+                ignore(sampler0);
                 return vec4<f32>(0.0, 0.0, 0.0, 0.0);
             })");