tint/hlsl: widen scope of workaround of DXC bug with const structs/arrays
Initial fix was not good enough:
https://dawn-review.googlesource.com/c/dawn/+/156900
In HLSL, composite types are all treated the same: arrays, structs,
vectors, and matrices. The bug happens when intializing a const variable
of composite type with another composite type. Any dynamic writes to the
rhs beforehand are ignored. To fix this, we simply will not emit 'const'
for any lets.
I've updated the upstream issue with these findings:
https://github.com/microsoft/DirectXShaderCompiler/issues/5883
Bug: tint:2059
Bug: tint:2150
Change-Id: I1df1017ee130514b3f6564791d1679145d8b1e7e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/171880
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.dxc.hlsl
index 45b7216..6ea8bcb 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.dxc.hlsl
@@ -16,9 +16,9 @@
if (!((idx < 6u))) {
break;
}
- const uint x_31 = idx;
- const uint x_33 = idx;
- const uint x_35 = idx;
+ uint x_31 = idx;
+ uint x_33 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[tint_div(x_31, 2u)][tint_mod(x_33, 2u)][tint_mod(x_35, 1u)], 0u, atomic_result);
{
@@ -32,7 +32,7 @@
}
void compute_main_1() {
- const uint x_57 = local_invocation_index_1;
+ uint x_57 = local_invocation_index_1;
compute_main_inner(x_57);
return;
}
@@ -44,9 +44,9 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 6u); idx_1 = (idx_1 + 1u)) {
- const uint i = (idx_1 / 2u);
- const uint i_1 = (idx_1 % 2u);
- const uint i_2 = (idx_1 % 1u);
+ uint i = (idx_1 / 2u);
+ uint i_1 = (idx_1 % 2u);
+ uint i_2 = (idx_1 % 1u);
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.fxc.hlsl
index 45b7216..6ea8bcb 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.spvasm.expected.fxc.hlsl
@@ -16,9 +16,9 @@
if (!((idx < 6u))) {
break;
}
- const uint x_31 = idx;
- const uint x_33 = idx;
- const uint x_35 = idx;
+ uint x_31 = idx;
+ uint x_33 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[tint_div(x_31, 2u)][tint_mod(x_33, 2u)][tint_mod(x_35, 1u)], 0u, atomic_result);
{
@@ -32,7 +32,7 @@
}
void compute_main_1() {
- const uint x_57 = local_invocation_index_1;
+ uint x_57 = local_invocation_index_1;
compute_main_inner(x_57);
return;
}
@@ -44,9 +44,9 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 6u); idx_1 = (idx_1 + 1u)) {
- const uint i = (idx_1 / 2u);
- const uint i_1 = (idx_1 % 2u);
- const uint i_2 = (idx_1 % 1u);
+ uint i = (idx_1 / 2u);
+ uint i_1 = (idx_1 % 2u);
+ uint i_2 = (idx_1 % 1u);
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.dxc.hlsl
index 4e13e38..f1093da 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.dxc.hlsl
@@ -7,9 +7,9 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 6u); idx = (idx + 1u)) {
- const uint i = (idx / 2u);
- const uint i_1 = (idx % 2u);
- const uint i_2 = (idx % 1u);
+ uint i = (idx / 2u);
+ uint i_1 = (idx % 2u);
+ uint i_2 = (idx % 1u);
uint atomic_result = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.fxc.hlsl
index 4e13e38..f1093da 100644
--- a/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/aliased_arrays.wgsl.expected.fxc.hlsl
@@ -7,9 +7,9 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 6u); idx = (idx + 1u)) {
- const uint i = (idx / 2u);
- const uint i_1 = (idx % 2u);
- const uint i_2 = (idx % 1u);
+ uint i = (idx / 2u);
+ uint i_1 = (idx % 2u);
+ uint i_2 = (idx % 1u);
uint atomic_result = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/array/array.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/array.spvasm.expected.dxc.hlsl
index 34ffbb5..c946c97 100644
--- a/test/tint/builtins/atomicStore/array/array.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/array.spvasm.expected.dxc.hlsl
@@ -8,7 +8,7 @@
if (!((idx < 4u))) {
break;
}
- const uint x_26 = idx;
+ uint x_26 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[x_26], 0u, atomic_result);
{
@@ -22,7 +22,7 @@
}
void compute_main_1() {
- const uint x_47 = local_invocation_index_1;
+ uint x_47 = local_invocation_index_1;
compute_main_inner(x_47);
return;
}
@@ -34,7 +34,7 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 4u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/array.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/array.spvasm.expected.fxc.hlsl
index 34ffbb5..c946c97 100644
--- a/test/tint/builtins/atomicStore/array/array.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/array.spvasm.expected.fxc.hlsl
@@ -8,7 +8,7 @@
if (!((idx < 4u))) {
break;
}
- const uint x_26 = idx;
+ uint x_26 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[x_26], 0u, atomic_result);
{
@@ -22,7 +22,7 @@
}
void compute_main_1() {
- const uint x_47 = local_invocation_index_1;
+ uint x_47 = local_invocation_index_1;
compute_main_inner(x_47);
return;
}
@@ -34,7 +34,7 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 4u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/array.wgsl.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/array.wgsl.expected.dxc.hlsl
index 7c252a9..e317d3a 100644
--- a/test/tint/builtins/atomicStore/array/array.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/array.wgsl.expected.dxc.hlsl
@@ -7,7 +7,7 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[i], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/array/array.wgsl.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/array.wgsl.expected.fxc.hlsl
index 7c252a9..e317d3a 100644
--- a/test/tint/builtins/atomicStore/array/array.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/array.wgsl.expected.fxc.hlsl
@@ -7,7 +7,7 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 4u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[i], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.dxc.hlsl
index 45b7216..6ea8bcb 100644
--- a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.dxc.hlsl
@@ -16,9 +16,9 @@
if (!((idx < 6u))) {
break;
}
- const uint x_31 = idx;
- const uint x_33 = idx;
- const uint x_35 = idx;
+ uint x_31 = idx;
+ uint x_33 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[tint_div(x_31, 2u)][tint_mod(x_33, 2u)][tint_mod(x_35, 1u)], 0u, atomic_result);
{
@@ -32,7 +32,7 @@
}
void compute_main_1() {
- const uint x_57 = local_invocation_index_1;
+ uint x_57 = local_invocation_index_1;
compute_main_inner(x_57);
return;
}
@@ -44,9 +44,9 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 6u); idx_1 = (idx_1 + 1u)) {
- const uint i = (idx_1 / 2u);
- const uint i_1 = (idx_1 % 2u);
- const uint i_2 = (idx_1 % 1u);
+ uint i = (idx_1 / 2u);
+ uint i_1 = (idx_1 % 2u);
+ uint i_2 = (idx_1 % 1u);
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.fxc.hlsl
index 45b7216..6ea8bcb 100644
--- a/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/arrays.spvasm.expected.fxc.hlsl
@@ -16,9 +16,9 @@
if (!((idx < 6u))) {
break;
}
- const uint x_31 = idx;
- const uint x_33 = idx;
- const uint x_35 = idx;
+ uint x_31 = idx;
+ uint x_33 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg[tint_div(x_31, 2u)][tint_mod(x_33, 2u)][tint_mod(x_35, 1u)], 0u, atomic_result);
{
@@ -32,7 +32,7 @@
}
void compute_main_1() {
- const uint x_57 = local_invocation_index_1;
+ uint x_57 = local_invocation_index_1;
compute_main_inner(x_57);
return;
}
@@ -44,9 +44,9 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 6u); idx_1 = (idx_1 + 1u)) {
- const uint i = (idx_1 / 2u);
- const uint i_1 = (idx_1 % 2u);
- const uint i_2 = (idx_1 % 1u);
+ uint i = (idx_1 / 2u);
+ uint i_1 = (idx_1 % 2u);
+ uint i_2 = (idx_1 % 1u);
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.dxc.hlsl b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.dxc.hlsl
index 4e13e38..f1093da 100644
--- a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.dxc.hlsl
@@ -7,9 +7,9 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 6u); idx = (idx + 1u)) {
- const uint i = (idx / 2u);
- const uint i_1 = (idx % 2u);
- const uint i_2 = (idx % 1u);
+ uint i = (idx / 2u);
+ uint i_1 = (idx % 2u);
+ uint i_2 = (idx % 1u);
uint atomic_result = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.fxc.hlsl b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.fxc.hlsl
index 4e13e38..f1093da 100644
--- a/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/array/arrays.wgsl.expected.fxc.hlsl
@@ -7,9 +7,9 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 6u); idx = (idx + 1u)) {
- const uint i = (idx / 2u);
- const uint i_1 = (idx % 2u);
- const uint i_2 = (idx % 1u);
+ uint i = (idx / 2u);
+ uint i_1 = (idx % 2u);
+ uint i_2 = (idx % 1u);
uint atomic_result = 0u;
InterlockedExchange(wg[i][i_1][i_2], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.dxc.hlsl
index ae8c7df..0d299af 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.dxc.hlsl
@@ -14,7 +14,7 @@
if (!((idx < 10u))) {
break;
}
- const uint x_28 = idx;
+ uint x_28 = idx;
wg[x_28].x = 0;
uint atomic_result = 0u;
InterlockedExchange(wg[x_28].a, 0u, atomic_result);
@@ -30,7 +30,7 @@
}
void compute_main_1() {
- const uint x_53 = local_invocation_index_1;
+ uint x_53 = local_invocation_index_1;
compute_main_inner(x_53);
return;
}
@@ -42,7 +42,7 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 10u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
wg[i].x = 0;
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i].a, 0u, atomic_result_2);
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.fxc.hlsl
index ae8c7df..0d299af 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.spvasm.expected.fxc.hlsl
@@ -14,7 +14,7 @@
if (!((idx < 10u))) {
break;
}
- const uint x_28 = idx;
+ uint x_28 = idx;
wg[x_28].x = 0;
uint atomic_result = 0u;
InterlockedExchange(wg[x_28].a, 0u, atomic_result);
@@ -30,7 +30,7 @@
}
void compute_main_1() {
- const uint x_53 = local_invocation_index_1;
+ uint x_53 = local_invocation_index_1;
compute_main_inner(x_53);
return;
}
@@ -42,7 +42,7 @@
void compute_main_inner_1(uint local_invocation_index_1_param) {
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 10u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
wg[i].x = 0;
uint atomic_result_2 = 0u;
InterlockedExchange(wg[i].a, 0u, atomic_result_2);
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.dxc.hlsl
index e11012c..b005711 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.dxc.hlsl
@@ -13,7 +13,7 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 10u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
wg[i].x = 0;
uint atomic_result = 0u;
InterlockedExchange(wg[i].a, 0u, atomic_result);
diff --git a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.fxc.hlsl
index e11012c..b005711 100644
--- a/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/array_of_struct.wgsl.expected.fxc.hlsl
@@ -13,7 +13,7 @@
void compute_main_inner(uint local_invocation_index) {
{
for(uint idx = local_invocation_index; (idx < 10u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
wg[i].x = 0;
uint atomic_result = 0u;
InterlockedExchange(wg[i].a, 0u, atomic_result);
diff --git a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.dxc.hlsl
index c56ccea..f0c0b04 100644
--- a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.dxc.hlsl
@@ -22,7 +22,7 @@
}
void compute_main_1() {
- const uint x_39 = local_invocation_index_1;
+ uint x_39 = local_invocation_index_1;
compute_main_inner(x_39);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.fxc.hlsl
index c56ccea..f0c0b04 100644
--- a/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/flat_multiple_atomics.spvasm.expected.fxc.hlsl
@@ -22,7 +22,7 @@
}
void compute_main_1() {
- const uint x_39 = local_invocation_index_1;
+ uint x_39 = local_invocation_index_1;
compute_main_inner(x_39);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.dxc.hlsl
index d735498..bd7a57b 100644
--- a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.dxc.hlsl
@@ -19,7 +19,7 @@
}
void compute_main_1() {
- const uint x_35 = local_invocation_index_1;
+ uint x_35 = local_invocation_index_1;
compute_main_inner(x_35);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.fxc.hlsl
index d735498..bd7a57b 100644
--- a/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/flat_single_atomic.spvasm.expected.fxc.hlsl
@@ -19,7 +19,7 @@
}
void compute_main_1() {
- const uint x_35 = local_invocation_index_1;
+ uint x_35 = local_invocation_index_1;
compute_main_inner(x_35);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.dxc.hlsl
index b564c9c..9957b1a 100644
--- a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.dxc.hlsl
@@ -39,7 +39,7 @@
}
void compute_main_1() {
- const uint x_44 = local_invocation_index_1;
+ uint x_44 = local_invocation_index_1;
compute_main_inner(x_44);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.fxc.hlsl
index b564c9c..9957b1a 100644
--- a/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/nested.spvasm.expected.fxc.hlsl
@@ -39,7 +39,7 @@
}
void compute_main_1() {
- const uint x_44 = local_invocation_index_1;
+ uint x_44 = local_invocation_index_1;
compute_main_inner(x_44);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.dxc.hlsl
index c96d4af..78d1ea7 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.dxc.hlsl
@@ -16,7 +16,7 @@
if (!((idx < 10u))) {
break;
}
- const uint x_35 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg.a[x_35], 0u, atomic_result);
{
@@ -30,7 +30,7 @@
}
void compute_main_1() {
- const uint x_53 = local_invocation_index_1;
+ uint x_53 = local_invocation_index_1;
compute_main_inner(x_53);
return;
}
@@ -46,7 +46,7 @@
}
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 10u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
uint atomic_result_2 = 0u;
InterlockedExchange(wg.a[i], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.fxc.hlsl
index c96d4af..78d1ea7 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.spvasm.expected.fxc.hlsl
@@ -16,7 +16,7 @@
if (!((idx < 10u))) {
break;
}
- const uint x_35 = idx;
+ uint x_35 = idx;
uint atomic_result = 0u;
InterlockedExchange(wg.a[x_35], 0u, atomic_result);
{
@@ -30,7 +30,7 @@
}
void compute_main_1() {
- const uint x_53 = local_invocation_index_1;
+ uint x_53 = local_invocation_index_1;
compute_main_inner(x_53);
return;
}
@@ -46,7 +46,7 @@
}
{
for(uint idx_1 = local_invocation_index_1_param; (idx_1 < 10u); idx_1 = (idx_1 + 1u)) {
- const uint i = idx_1;
+ uint i = idx_1;
uint atomic_result_2 = 0u;
InterlockedExchange(wg.a[i], 0u, atomic_result_2);
}
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.dxc.hlsl
index 1a042b7..c173184 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.dxc.hlsl
@@ -17,7 +17,7 @@
}
{
for(uint idx = local_invocation_index; (idx < 10u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
uint atomic_result = 0u;
InterlockedExchange(wg.a[i], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.fxc.hlsl
index 1a042b7..c173184 100644
--- a/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/struct_of_array.wgsl.expected.fxc.hlsl
@@ -17,7 +17,7 @@
}
{
for(uint idx = local_invocation_index; (idx < 10u); idx = (idx + 1u)) {
- const uint i = idx;
+ uint i = idx;
uint atomic_result = 0u;
InterlockedExchange(wg.a[i], 0u, atomic_result);
}
diff --git a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.dxc.hlsl b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.dxc.hlsl
index d735498..bd7a57b 100644
--- a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.dxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.dxc.hlsl
@@ -19,7 +19,7 @@
}
void compute_main_1() {
- const uint x_35 = local_invocation_index_1;
+ uint x_35 = local_invocation_index_1;
compute_main_inner(x_35);
return;
}
diff --git a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.fxc.hlsl b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.fxc.hlsl
index d735498..bd7a57b 100644
--- a/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.fxc.hlsl
+++ b/test/tint/builtins/atomicStore/struct/via_ptr_let.spvasm.expected.fxc.hlsl
@@ -19,7 +19,7 @@
}
void compute_main_1() {
- const uint x_35 = local_invocation_index_1;
+ uint x_35 = local_invocation_index_1;
compute_main_inner(x_35);
return;
}
