nonuniform: ByteAddressableBuffer always decorates NonUniform

Author: Firestar99

crates/rustc_codegen_spirv/src/builder/byte_addressable_buffer.rs

@@ -1,7 +1,7 @@
 use super::Builder;
 use crate::builder_spirv::{SpirvValue, SpirvValueExt, SpirvValueKind};
 use crate::spirv_type::SpirvType;
-use rspirv::spirv::Word;
+use rspirv::spirv::{Decoration, Word};
 use rustc_codegen_ssa::traits::BuilderMethods;
 use rustc_errors::ErrorGuaranteed;
 use rustc_span::DUMMY_SP;
@@ -38,9 +38,14 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         };
         let u32_ty = SpirvType::Integer(32, false).def(DUMMY_SP, self);
         let u32_ptr = self.type_ptr_to(u32_ty);
+        let array = array.def(self);
+        let actual_index = actual_index.def(self);
+        self.emit().decorate(array, Decoration::NonUniform, []);
+        self.emit()
+            .decorate(actual_index, Decoration::NonUniform, []);
         let ptr = self
             .emit()
-            .in_bounds_access_chain(u32_ptr, None, array.def(self), [actual_index.def(self)])
+            .in_bounds_access_chain(u32_ptr, None, array, [actual_index])
             .unwrap()
             .with_type(u32_ptr);
         self.load(u32_ty, ptr, Align::ONE)

tests/ui/byte_addressable_buffer/arr.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec4, ByteAddressableBuffer};
+use spirv_std::{ByteAddressableBuffer, glam::Vec4};
 
 #[spirv(fragment)]
 pub fn load(

tests/ui/byte_addressable_buffer/big_struct.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
-use spirv_std::spirv;
 use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
 
 pub struct BigStruct {
     a: u32,

tests/ui/byte_addressable_buffer/complex.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec2, ByteAddressableBuffer};
+use spirv_std::{ByteAddressableBuffer, glam::Vec2};
 
 pub struct Complex {
     x: u32,

tests/ui/byte_addressable_buffer/f32.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
-use spirv_std::spirv;
 use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
 
 #[spirv(fragment)]
 pub fn load(#[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &[u32], out: &mut f32) {

tests/ui/byte_addressable_buffer/small_struct.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
-use spirv_std::spirv;
 use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
 
 pub struct SmallStruct {
     a: u32,

tests/ui/byte_addressable_buffer/u32.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
-use spirv_std::spirv;
 use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
 
 #[spirv(fragment)]
 pub fn load(#[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &[u32], out: &mut u32) {

tests/ui/byte_addressable_buffer/vec.rs

@@ -1,7 +1,8 @@
 // build-pass
+// compile-flags: -Ctarget-feature=+ShaderNonUniform,+ext:SPV_EXT_descriptor_indexing
 
 use spirv_std::spirv;
-use spirv_std::{glam::Vec4, ByteAddressableBuffer};
+use spirv_std::{ByteAddressableBuffer, glam::Vec4};
 
 #[spirv(matrix)]
 pub struct Mat4 {