commit 2a57db73cbfc35bc9446bdfee691359934b99340
author Sarah <sarahmashay@google.com> Wed Jun 23 19:19:06 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 23 19:19:06 2021 +0000
tree f68db65413b9df58bd8b3d53f93ce017d23c0d90
parent 1317636fc88c8daf89272427b6e1c284755b077c

update compute shaders to include workgroup_size in their attribute

Change-Id: Ia9027f8ec9c4a293ae1bef735c8b5eeea84e81e2
Bug: tint:884
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/55685
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>

src/tests/end2end/GpuMemorySynchronizationTests.cpp

diff --git a/src/tests/end2end/GpuMemorySynchronizationTests.cpp b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
index 035b647..4989ce1 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -40,7 +40,7 @@
                 a : i32;
             };
             [[group(0), binding(0)]] var<storage, read_write> data : Data;
-            [[stage(compute)]] fn main() {
+            [[stage(compute), workgroup_size(1)]] fn main() {
                 data.a = data.a + 1;
             })");
 
@@ -259,7 +259,7 @@
         [[group(0), binding(1)]] var sampledTex : texture_2d<u32>;
         [[group(0), binding(2)]] var storageTex : texture_storage_2d<r32uint, read>;
 
-        [[stage(compute)]] fn main() {
+        [[stage(compute), workgroup_size(1)]] fn main() {
             output.sampledOut = textureLoad(sampledTex, vec2<i32>(0, 0), 0).x;
             output.storageOut = textureLoad(storageTex, vec2<i32>(0, 0)).x;
         }
@@ -316,7 +316,7 @@
                 a : f32;
             };
             [[group(0), binding(0)]] var<storage, read_write> data : Data;
-            [[stage(compute)]] fn main() {
+            [[stage(compute), workgroup_size(1)]] fn main() {
                 data.a = 1.0;
             })");
 
@@ -529,7 +529,7 @@
         [[group(0), binding(2)]] var<storage, read_write> uniformContents : ColorContents1;
         [[group(0), binding(3)]] var<storage, read_write> storageContents : ColorContents2;
 
-        [[stage(compute)]] fn main() {
+        [[stage(compute), workgroup_size(1)]] fn main() {
             vbContents.pos[0] = vec4<f32>(-1.0, 1.0, 0.0, 1.0);
             vbContents.pos[1] = vec4<f32>(1.0, 1.0, 0.0, 1.0);
             vbContents.pos[2] = vec4<f32>(1.0, -1.0, 0.0, 1.0);
@@ -644,7 +644,7 @@
 
         [[group(0), binding(0)]] var<storage, read_write> contents : Contents;
 
-        [[stage(compute)]] fn main() {
+        [[stage(compute), workgroup_size(1)]] fn main() {
             contents.pos[0] = vec4<f32>(-1.0, 1.0, 0.0, 1.0);
             contents.pos[1] = vec4<f32>(1.0, 1.0, 0.0, 1.0);
             contents.pos[2] = vec4<f32>(1.0, -1.0, 0.0, 1.0);