commit 4773e8d0f9808854bc1c765181218605f36ad0eb
author Ben Clayton <bclayton@google.com> Tue Jul 13 15:21:07 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jul 13 15:21:07 2021 +0000
tree f17a9062a6d25d4bfa017eb98fc6adb175eb3a5d
parent f1c76f5dfe0669c2fb00a3a9b0a78f4b0788c465

wgsl: Clean up duplicated [[block]] structs

crbug.com/tint/386 has been fixed.
We don't need these work arounds any more.

Original CL by bclayton@:
https://dawn-review.googlesource.com/c/dawn/+/54641

Bug: tint:386
Fixed: dawn:943
Fixed: dawn:975
Change-Id: I1b94d1e33b023b7d9b3153094f829885a75b5a5e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/57743
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Austin Eng <enga@chromium.org>
Reviewed-by: 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 d125857..bafab67 100644
--- a/src/tests/end2end/GpuMemorySynchronizationTests.cpp
+++ b/src/tests/end2end/GpuMemorySynchronizationTests.cpp
@@ -519,15 +519,11 @@
         };
         [[group(0), binding(1)]] var<storage, read_write> ibContents : IBContents;
 
-        // TODO(crbug.com/tint/386): Use the same struct.
-        [[block]] struct ColorContents1 {
+        [[block]] struct ColorContents {
             color : f32;
         };
-        [[block]] struct ColorContents2 {
-            color : f32;
-        };
-        [[group(0), binding(2)]] var<storage, read_write> uniformContents : ColorContents1;
-        [[group(0), binding(3)]] var<storage, read_write> storageContents : ColorContents2;
+        [[group(0), binding(2)]] var<storage, read_write> uniformContents : ColorContents;
+        [[group(0), binding(3)]] var<storage, read_write> storageContents : ColorContents;
 
         [[stage(compute), workgroup_size(1)]] fn main() {
             vbContents.pos[0] = vec4<f32>(-1.0, 1.0, 0.0, 1.0);