commit e87ea2bedc8bc9e4cdd49039337119494846db7e
author Brandon Jones <bajones@chromium.org> Wed Apr 14 17:05:07 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed Apr 14 17:05:07 2021 +0000
tree 72c4cbf49a1f14644684bff54b8938001a0f5176
parent d798f331a26b487d10f7e4b008187d754bca06b7

Update WGSL syntax for end2end tests

Changes I/O to use function parameters and return values, removes
unnecessary "-> void" return types, and changes "const" to "let".

BUG: dawn:755
Change-Id: Iabbfcc280fae37d73cba6a2f7e2215ed579a04e0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/47700
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>

src/tests/end2end/DepthStencilCopyTests.cpp

diff --git a/src/tests/end2end/DepthStencilCopyTests.cpp b/src/tests/end2end/DepthStencilCopyTests.cpp
index 166a926..b585133 100644
--- a/src/tests/end2end/DepthStencilCopyTests.cpp
+++ b/src/tests/end2end/DepthStencilCopyTests.cpp
@@ -29,18 +29,16 @@
 
         // Draw a square in the bottom left quarter of the screen.
         mVertexModule = utils::CreateShaderModule(device, R"(
-            [[builtin(vertex_index)]] var<in> VertexIndex : u32;
-            [[builtin(position)]] var<out> Position : vec4<f32>;
-
-            [[stage(vertex)]] fn main() {
-                const pos : array<vec2<f32>, 6> = array<vec2<f32>, 6>(
+            [[stage(vertex)]]
+            fn main([[builtin(vertex_index)]] VertexIndex : u32) -> [[builtin(position)]] vec4<f32> {
+                let pos : array<vec2<f32>, 6> = array<vec2<f32>, 6>(
                     vec2<f32>(-1.0, -1.0),
                     vec2<f32>( 0.0, -1.0),
                     vec2<f32>(-1.0,  0.0),
                     vec2<f32>(-1.0,  0.0),
                     vec2<f32>( 0.0, -1.0),
                     vec2<f32>( 0.0,  0.0));
-                Position = vec4<f32>(pos[VertexIndex], 0.0, 1.0);
+                return vec4<f32>(pos[VertexIndex], 0.0, 1.0);
             })");
     }
 
@@ -74,9 +72,8 @@
         desc->vertex.module = mVertexModule;
 
         std::string fsSource = R"(
-        [[builtin(frag_depth)]] var<out> FragDepth : f32;
-        [[stage(fragment)]] fn main() {
-            FragDepth = )" + std::to_string(regionDepth) +
+        [[stage(fragment)]] fn main() -> [[builtin(frag_depth)]] f32 {
+            return )" + std::to_string(regionDepth) +
                                ";\n}";
 
         desc->cFragment.module = utils::CreateShaderModule(device, fsSource.c_str());
@@ -239,29 +236,31 @@
         utils::ComboRenderPipelineDescriptor2 pipelineDescriptor;
 
         pipelineDescriptor.vertex.module = utils::CreateShaderModule(device, R"(
-            [[builtin(vertex_index)]] var<in> VertexIndex : u32;
-            [[builtin(position)]] var<out> Position : vec4<f32>;
-
-            [[stage(vertex)]] fn main() {
-                const pos : array<vec2<f32>, 3> = array<vec2<f32>, 3>(
+            [[stage(vertex)]]
+            fn main([[builtin(vertex_index)]] VertexIndex : u32) -> [[builtin(position)]] vec4<f32> {
+                let pos : array<vec2<f32>, 3> = array<vec2<f32>, 3>(
                     vec2<f32>(-1.0, -1.0),
                     vec2<f32>( 3.0, -1.0),
                     vec2<f32>(-1.0,  3.0));
-                Position = vec4<f32>(pos[VertexIndex], 0.0, 1.0);
+                return vec4<f32>(pos[VertexIndex], 0.0, 1.0);
             })");
 
         // Sample the input texture and write out depth. |result| will only be set to 1 if we
         // pass the depth test.
         pipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"(
             [[group(0), binding(0)]] var texture0 : texture_2d<f32>;
-            [[builtin(frag_coord)]] var<in> FragCoord : vec4<f32>;
 
-            [[location(0)]] var<out> result : u32;
-            [[builtin(frag_depth)]] var<out> FragDepth : f32;
+            struct FragmentOut {
+                [[location(0)]] result : u32;
+                [[builtin(frag_depth)]] fragDepth : f32;
+            };
 
-            [[stage(fragment)]] fn main() {
-                result = 1u;
-                FragDepth = textureLoad(texture0, vec2<i32>(FragCoord.xy), 0)[0];
+            [[stage(fragment)]]
+            fn main([[builtin(frag_coord)]] FragCoord : vec4<f32>) -> FragmentOut {
+                var output : FragmentOut;
+                output.result = 1u;
+                output.fragDepth = textureLoad(texture0, vec2<i32>(FragCoord.xy), 0)[0];
+                return output;
             })");
 
         // Pass the depth test only if the depth is equal.