commit d4f8c39f52c1eb8b03321b8a39c835365e5b98a5
author James Price <jrprice@google.com> Wed Dec 15 13:13:26 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 15 13:13:26 2021 +0000
tree 30796beac4b5835f7b1a83e439cd9ebe4b0b5d92
parent 16ae3b8b95eccbd73befde361bf3e9bda60b6bb2

Remove [[block]] attribute from all shaders

This has been removed from WGSL and is now deprecated in Tint.

Bug: tint:1324
Change-Id: Ic187ce3c5ce0723db6f3ca6483e9f5e73ce27acc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/72880
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/tests/white_box/D3D12DescriptorHeapTests.cpp

diff --git a/src/tests/white_box/D3D12DescriptorHeapTests.cpp b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
index 513a165..14bf526 100644
--- a/src/tests/white_box/D3D12DescriptorHeapTests.cpp
+++ b/src/tests/white_box/D3D12DescriptorHeapTests.cpp
@@ -53,7 +53,7 @@
             })");
 
         mSimpleFSModule = utils::CreateShaderModule(device, R"(
-            [[block]] struct U {
+            struct U {
                 color : vec4<f32>;
             };
             [[group(0), binding(0)]] var<uniform> colorBuffer : U;
@@ -444,7 +444,7 @@
     pipelineDescriptor.vertex.module = mSimpleVSModule;
 
     pipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"(
-        [[block]] struct U {
+        struct U {
             heapSize : f32;
         };
         [[group(0), binding(0)]] var<uniform> buffer0 : U;
@@ -777,7 +777,7 @@
         utils::ComboRenderPipelineDescriptor pipelineDescriptor;
 
         pipelineDescriptor.vertex.module = utils::CreateShaderModule(device, R"(
-            [[block]] struct U {
+            struct U {
                 transform : mat2x2<f32>;
             };
             [[group(0), binding(0)]] var<uniform> buffer0 : U;
@@ -793,7 +793,7 @@
                 return vec4<f32>(buffer0.transform * (pos[VertexIndex]), 0.0, 1.0);
             })");
         pipelineDescriptor.cFragment.module = utils::CreateShaderModule(device, R"(
-            [[block]] struct U {
+            struct U {
                 color : vec4<f32>;
             };
             [[group(0), binding(1)]] var sampler0 : sampler;