commit 0f9c2d7b78752a7a41bbc417dbfdd1241585cbc6
author dan sinclair <dsinclair@chromium.org> Tue Jan 19 14:18:51 2021 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Jan 19 14:18:51 2021 +0000
tree a5ebcac7fa5e4e399a77b7aae783f1e93234a542
parent e45593cb0876d9bf586501b45108bfc766096a69

Update Dawn tests to use group instead of set.

This Cl updates the WGSL used by Dawn to use the new `group` decoration
instead of the deprecated `set` decoration.

Change-Id: I145aaff7721dfafff986ddc429c9cdc9389c2110
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/38141
Auto-Submit: dan sinclair <dsinclair@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

src/tests/end2end/GpuMemorySynchronizationTests.cpp

diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
index 7740cb3..4db671c 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -46,7 +46,7 @@
             [[block]] struct Data {
                 [[offset(0)]] a : i32;
             };
-            [[set(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
+            [[group(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
             [[stage(compute)]] fn main() -> void {
                 data.a = data.a + 1;
             })");
@@ -74,7 +74,7 @@
             [[block]] struct Data {
                 [[offset(0)]] i : i32;
             };
-            [[set(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
+            [[group(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
             [[location(0)]] var<out> fragColor : vec4<f32>;
             [[stage(fragment)]] fn main() -> void {
                 data.i = data.i + 1;
@@ -262,7 +262,7 @@
             [[block]] struct Data {
                 [[offset(0)]] a : f32;
             };
-            [[set(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
+            [[group(0), binding(0)]] var<storage_buffer> data : [[access(read_write)]] Data;
             [[stage(compute)]] fn main() -> void {
                 data.a = 1.0;
             })");
@@ -289,7 +289,7 @@
             [[block]] struct Contents {
                 [[offset(0)]] color : f32;
             };
-            [[set(0), binding(0)]] var<uniform> contents : Contents;
+            [[group(0), binding(0)]] var<uniform> contents : Contents;
 
             [[location(0)]] var<out> fragColor : vec4<f32>;
             [[stage(fragment)]] fn main() -> void {
@@ -461,12 +461,12 @@
         [[block]] struct VBContents {
             [[offset(0)]] pos : [[stride(16)]] array<vec4<f32>, 4>;
         };
-        [[set(0), binding(0)]] var<storage_buffer> vbContents : [[access(read_write)]] VBContents;
+        [[group(0), binding(0)]] var<storage_buffer> vbContents : [[access(read_write)]] VBContents;
 
         [[block]] struct IBContents {
             [[offset(0)]] indices : [[stride(16)]] array<vec4<i32>, 2>;
         };
-        [[set(0), binding(1)]] var<storage_buffer> ibContents : [[access(read_write)]] IBContents;
+        [[group(0), binding(1)]] var<storage_buffer> ibContents : [[access(read_write)]] IBContents;
 
         // TODO(crbug.com/tint/386): Use the same struct.
         [[block]] struct ColorContents1 {
@@ -475,8 +475,8 @@
         [[block]] struct ColorContents2 {
             [[offset(0)]] color : f32;
         };
-        [[set(0), binding(2)]] var<storage_buffer> uniformContents : [[access(read_write)]] ColorContents1;
-        [[set(0), binding(3)]] var<storage_buffer> storageContents : [[access(read_write)]] ColorContents2;
+        [[group(0), binding(2)]] var<storage_buffer> uniformContents : [[access(read_write)]] ColorContents1;
+        [[group(0), binding(3)]] var<storage_buffer> storageContents : [[access(read_write)]] ColorContents2;
 
         [[stage(compute)]] fn main() -> void {
             vbContents.pos[0] = vec4<f32>(-1.0, 1.0, 0.0, 1.0);
@@ -530,8 +530,8 @@
             [[offset(0)]] color : f32;
         };
 
-        [[set(0), binding(0)]] var<uniform> uniformBuffer : Buf;
-        [[set(0), binding(1)]] var<storage_buffer> storageBuffer : [[access(read)]] Buf;
+        [[group(0), binding(0)]] var<uniform> uniformBuffer : Buf;
+        [[group(0), binding(1)]] var<storage_buffer> storageBuffer : [[access(read)]] Buf;
 
         [[location(0)]] var<out> fragColor : vec4<f32>;
         [[stage(fragment)]] fn main() -> void {
@@ -588,7 +588,7 @@
             [[offset(768)]] color1 : f32;
         };
 
-        [[set(0), binding(0)]] var<storage_buffer> contents : [[access(read_write)]] Contents;
+        [[group(0), binding(0)]] var<storage_buffer> contents : [[access(read_write)]] Contents;
 
         [[stage(compute)]] fn main() -> void {
             contents.pos[0] = vec4<f32>(-1.0, 1.0, 0.0, 1.0);
@@ -642,8 +642,8 @@
         [[block]] struct Buf {
             [[offset(0)]] color : f32;
         };
-        [[set(0), binding(0)]] var<uniform> uniformBuffer : Buf;
-        [[set(0), binding(1)]] var<storage_buffer> storageBuffer : [[access(read)]] Buf;
+        [[group(0), binding(0)]] var<uniform> uniformBuffer : Buf;
+        [[group(0), binding(1)]] var<storage_buffer> storageBuffer : [[access(read)]] Buf;
 
         [[location(0)]] var<out> fragColor : vec4<f32>;
         [[stage(fragment)]] fn main() -> void {