commit 9a6ca2878e6c0faccf458ee63de39fdb28af69b3
author Corentin Wallez <cwallez@chromium.org> Tue Sep 20 15:58:27 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 20 15:58:27 2022 +0000
tree 2624f9f65382fe0a5b8ba6584c460ed2bd44c1a1
parent 7d9140feb9a7273801400c0e7166f8d994db8ce1

Fix deprecation warnings of module-scope lets

By promoting them to "const" as the deprecation warning suggests.

Bug: None
Change-Id: I7110b8d38754a0785d7fd56343c2c905dc491e1a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/103023
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn/tests/DawnTest.cpp

diff --git a/src/dawn/tests/DawnTest.cpp b/src/dawn/tests/DawnTest.cpp
index ff72d34..8dc4d5d 100644
--- a/src/dawn/tests/DawnTest.cpp
+++ b/src/dawn/tests/DawnTest.cpp
@@ -1095,7 +1095,7 @@
                                                              uint32_t sampleCount,
                                                              detail::Expectation* expectation) {
     std::ostringstream shaderSource;
-    shaderSource << "let width : u32 = " << width << "u;\n";
+    shaderSource << "const width : u32 = " << width << "u;\n";
     shaderSource << "@group(0) @binding(0) var tex : " << wgslTextureType << ";\n";
     shaderSource << R"(
         struct Result {
@@ -1103,8 +1103,8 @@
         }
         @group(0) @binding(1) var<storage, read_write> result : Result;
     )";
-    shaderSource << "let componentCount : u32 = " << componentCount << "u;\n";
-    shaderSource << "let sampleCount : u32 = " << sampleCount << "u;\n";
+    shaderSource << "const componentCount : u32 = " << componentCount << "u;\n";
+    shaderSource << "const sampleCount : u32 = " << sampleCount << "u;\n";
 
     shaderSource << "fn doTextureLoad(t: " << wgslTextureType
                  << ", coord: vec2<i32>, sample: u32, component: u32) -> f32";

src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp

diff --git a/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp b/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp
index c63e762..94822df 100644
--- a/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp
+++ b/src/dawn/tests/end2end/ComputeSharedMemoryTests.cpp
@@ -71,8 +71,8 @@
 // Basic shared memory test
 TEST_P(ComputeSharedMemoryTests, Basic) {
     BasicTest(R"(
-        let kTileSize : u32 = 4u;
-        let kInstances : u32 = 11u;
+        const kTileSize : u32 = 4u;
+        const kInstances : u32 = 11u;
 
         struct Dst {
             x : u32

src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp

diff --git a/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp b/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp
index 61caf90..91332c6 100644
--- a/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp
+++ b/src/dawn/tests/end2end/DynamicBufferOffsetTests.cpp
@@ -133,7 +133,7 @@
             )";
         }
 
-        fs << "let multipleNumber : u32 = " << multipleNumber << "u;\n";
+        fs << "const multipleNumber : u32 = " << multipleNumber << "u;\n";
         fs << R"(
             @fragment fn main() -> @location(0) vec4<f32> {
                 sBufferNotDynamic.value = uBufferNotDynamic.value.xy;
@@ -183,7 +183,7 @@
             )";
         }
 
-        cs << "let multipleNumber : u32 = " << multipleNumber << "u;\n";
+        cs << "const multipleNumber : u32 = " << multipleNumber << "u;\n";
         cs << R"(
             @compute @workgroup_size(1) fn main() {
                 sBufferNotDynamic.value = uBufferNotDynamic.value.xy;