From ce1539519016745e7ff45fd5ec37ace80d27913b Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Tue, 27 Jul 2021 07:51:26 +0000 Subject: [PATCH] Fix WGSL usage of "let" Bug: none Change-Id: If2e1617bc17192880aff88d8f4a52315be593553 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59880 Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng Commit-Queue: Corentin Wallez --- .../validation/GetBindGroupLayoutValidationTests.cpp | 6 +++--- src/tests/white_box/D3D12DescriptorHeapTests.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp index 4515a24f43..7fddceade2 100644 --- a/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp +++ b/src/tests/unittests/validation/GetBindGroupLayoutValidationTests.cpp @@ -387,7 +387,7 @@ TEST_F(GetBindGroupLayoutTests, BindingType) { [[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 @@ TEST_F(GetBindGroupLayoutTests, StageAggregation) { wgpu::ShaderModule vsModuleSampler = utils::CreateShaderModule(device, R"( [[group(0), binding(0)]] var mySampler: sampler; [[stage(vertex)]] fn main() -> [[builtin(position)]] vec4 { - let s : sampler = mySampler; + ignore(mySampler); return vec4(); })"); @@ -764,7 +764,7 @@ TEST_F(GetBindGroupLayoutTests, StageAggregation) { 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. diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp index fec3550db6..8d957af46b 100644 --- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp +++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp @@ -183,7 +183,7 @@ TEST_P(D3D12DescriptorHeapTests, NoSwitchOverSamplerHeap) { renderPipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"( [[group(0), binding(0)]] var sampler0 : sampler; [[stage(fragment)]] fn main() -> [[location(0)]] vec4 { - let referenceSampler : sampler = sampler0; + ignore(sampler0); return vec4(0.0, 0.0, 0.0, 0.0); })");