commit f6e5cc03bf605416b73ea69e23ef94962d32fc30
author James Price <jrprice@google.com> Thu Jan 20 22:11:07 2022 +0000
committer James Price <jrprice@google.com> Thu Jan 20 22:11:07 2022 +0000
tree 0ead7666be27293a5ad0cf30ef767942560ac723
parent e04d0f40de936147a2595933ad95a1fa32e8e0f6

Deprecate the @stride attribute

Update validation error for invalid uniform array element alignment.

Update tests to either remove the @stride attribute or use a different
element type.

Bug: tint:1381
Change-Id: I50b52cd78a34d9cd162fa5f2171a5fd35dcf3b79
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/77560
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

test/array/assign_to_workgroup_var.wgsl.expected.hlsl

diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.hlsl b/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
index b60b974..4243ec1 100644
--- a/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
+++ b/test/array/assign_to_workgroup_var.wgsl.expected.hlsl
@@ -3,25 +3,22 @@
   return;
 }
 
-struct tint_padded_array_element {
-  int el;
-};
 struct S {
-  tint_padded_array_element arr[4];
+  int4 arr[4];
 };
 
-static tint_padded_array_element src_private[4] = (tint_padded_array_element[4])0;
-groupshared tint_padded_array_element src_workgroup[4];
+static int4 src_private[4] = (int4[4])0;
+groupshared int4 src_workgroup[4];
 cbuffer cbuffer_src_uniform : register(b0, space0) {
   uint4 src_uniform[4];
 };
 RWByteAddressBuffer src_storage : register(u1, space0);
-groupshared tint_padded_array_element tint_symbol[4];
+groupshared int4 tint_symbol[4];
 groupshared int dst_nested[4][3][2];
 
-typedef tint_padded_array_element ret_arr_ret[4];
+typedef int4 ret_arr_ret[4];
 ret_arr_ret ret_arr() {
-  const tint_padded_array_element tint_symbol_5[4] = (tint_padded_array_element[4])0;
+  const int4 tint_symbol_5[4] = (int4[4])0;
   return tint_symbol_5;
 }
 
@@ -30,36 +27,36 @@
   return tint_symbol_6;
 }
 
-typedef tint_padded_array_element tint_symbol_1_ret[4];
+typedef int4 tint_symbol_1_ret[4];
 tint_symbol_1_ret tint_symbol_1(uint4 buffer[4], uint offset) {
-  tint_padded_array_element arr_1[4] = (tint_padded_array_element[4])0;
+  int4 arr_1[4] = (int4[4])0;
   {
     [loop] for(uint i = 0u; (i < 4u); i = (i + 1u)) {
       const uint scalar_offset = ((offset + (i * 16u))) / 4;
-      arr_1[i].el = asint(buffer[scalar_offset / 4][scalar_offset % 4]);
+      arr_1[i] = asint(buffer[scalar_offset / 4]);
     }
   }
   return arr_1;
 }
 
-typedef tint_padded_array_element tint_symbol_3_ret[4];
+typedef int4 tint_symbol_3_ret[4];
 tint_symbol_3_ret tint_symbol_3(RWByteAddressBuffer buffer, uint offset) {
-  tint_padded_array_element arr_2[4] = (tint_padded_array_element[4])0;
+  int4 arr_2[4] = (int4[4])0;
   {
     [loop] for(uint i_1 = 0u; (i_1 < 4u); i_1 = (i_1 + 1u)) {
-      arr_2[i_1].el = asint(buffer.Load((offset + (i_1 * 16u))));
+      arr_2[i_1] = asint(buffer.Load4((offset + (i_1 * 16u))));
     }
   }
   return arr_2;
 }
 
-void foo(tint_padded_array_element src_param[4]) {
-  tint_padded_array_element src_function[4] = (tint_padded_array_element[4])0;
-  const tint_padded_array_element tint_symbol_7[4] = {{1}, {2}, {3}, {3}};
+void foo(int4 src_param[4]) {
+  int4 src_function[4] = (int4[4])0;
+  const int4 tint_symbol_7[4] = {int4((1).xxxx), int4((2).xxxx), int4((3).xxxx), int4((3).xxxx)};
   tint_symbol = tint_symbol_7;
   tint_symbol = src_param;
   tint_symbol = ret_arr();
-  const tint_padded_array_element src_let[4] = (tint_padded_array_element[4])0;
+  const int4 src_let[4] = (int4[4])0;
   tint_symbol = src_let;
   tint_symbol = src_function;
   tint_symbol = src_private;