nonuniform: RuntimeArray::deref decorates index as NonUniform

Author: Firestar99

crates/spirv-std/src/runtime_array.rs

@@ -31,15 +31,18 @@ impl<T> RuntimeArray<T> {
     #[spirv_std_macros::gpu_only]
     pub unsafe fn index(&self, index: usize) -> &T {
         // FIXME(eddyb) `let mut result = T::default()` uses (for `asm!`), with this.
-        let mut result_slot = core::mem::MaybeUninit::uninit();
+        let mut result = core::mem::MaybeUninit::uninit();
         asm! {
-            "%result = OpAccessChain _ {arr} {index}",
-            "OpStore {result_slot} %result",
-            arr = in(reg) self,
-            index = in(reg) index,
-            result_slot = in(reg) result_slot.as_mut_ptr(),
+            "OpDecorate %index NonUniform",
+            "OpDecorate %result NonUniform",
+            "%index = OpLoad _ {index}",
+            "%result = OpAccessChain typeof*{result} {this} %index",
+            "OpStore {result} %result",
+            result = in(reg) result.as_mut_ptr(),
+            this = in(reg) self,
+            index = in(reg) &index,
         }
-        result_slot.assume_init()
+        result.assume_init()
     }
 
     /// Index the array, returning a mutable reference to an element. Unfortunately, because the
@@ -52,14 +55,17 @@ impl<T> RuntimeArray<T> {
     #[spirv_std_macros::gpu_only]
     pub unsafe fn index_mut(&mut self, index: usize) -> &mut T {
         // FIXME(eddyb) `let mut result = T::default()` uses (for `asm!`), with this.
-        let mut result_slot = core::mem::MaybeUninit::uninit();
+        let mut result = core::mem::MaybeUninit::uninit();
         asm! {
-            "%result = OpAccessChain _ {arr} {index}",
-            "OpStore {result_slot} %result",
-            arr = in(reg) self,
-            index = in(reg) index,
-            result_slot = in(reg) result_slot.as_mut_ptr(),
+            "OpDecorate %index NonUniform",
+            "OpDecorate %result NonUniform",
+            "%index = OpLoad _ {index}",
+            "%result = OpAccessChain typeof*{result} {this} %index",
+            "OpStore {result} %result",
+            result = in(reg) result.as_mut_ptr(),
+            this = in(reg) self,
+            index = in(reg) &index,
         }
-        result_slot.assume_init()
+        result.assume_init()
     }
 }