byte_addr_buffer: compiletests with mixed scalar and scalar pairs, store is failing

Author: Firestar99

tests/compiletests/ui/byte_addressable_buffer/scalar_and_pair_mix_load.rs

@@ -0,0 +1,32 @@
+// build-pass
+
+use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalar(i32);
+
+#[spirv(fragment)]
+pub fn load_scalar(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &[u32],
+    scalar: &mut MyScalar,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_slice(buf);
+        *scalar = buf.load(5);
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalarPair(i32, i32);
+
+#[spirv(fragment)]
+pub fn load_scalar_pair(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &[u32],
+    scalar_pair: &mut MyScalarPair,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_slice(buf);
+        *scalar_pair = buf.load(5);
+    }
+}

tests/compiletests/ui/byte_addressable_buffer/scalar_and_pair_mix_load_mut.rs

@@ -0,0 +1,32 @@
+// build-pass
+
+use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalar(i32);
+
+#[spirv(fragment)]
+pub fn load_scalar(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    scalar: &mut MyScalar,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_mut_slice(buf);
+        *scalar = buf.load(5);
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalarPair(i32, i32);
+
+#[spirv(fragment)]
+pub fn load_scalar_pair(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    scalar_pair: &mut MyScalarPair,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_mut_slice(buf);
+        *scalar_pair = buf.load(5);
+    }
+}

tests/compiletests/ui/byte_addressable_buffer/scalar_and_pair_mix_store.rs

@@ -0,0 +1,33 @@
+// build-pass
+
+use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalar(i32);
+
+#[spirv(fragment)]
+pub fn store_scalar(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    #[spirv(flat)] scalar: MyScalar,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_mut_slice(buf);
+        buf.store(5, scalar);
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalarPair(i32, i32);
+
+#[spirv(fragment)]
+pub fn store_scalar_pair(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    #[spirv(flat)] pair0: i32,
+    #[spirv(flat)] pair1: i32,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_mut_slice(buf);
+        buf.store(5, MyScalarPair(pair0, pair1));
+    }
+}

tests/compiletests/ui/byte_addressable_buffer/scalar_pair.rs

@@ -0,0 +1,41 @@
+// build-pass
+
+use spirv_std::ByteAddressableBuffer;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Debug)]
+pub struct MyScalarPair(i32, i32);
+
+#[spirv(fragment)]
+pub fn load(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &[u32],
+    scalar_pair: &mut MyScalarPair,
+) {
+    unsafe {
+        let buf = ByteAddressableBuffer::from_slice(buf);
+        *scalar_pair = buf.load(5);
+    }
+}
+
+#[spirv(fragment)]
+pub fn load_mut(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    scalar_pair: &mut MyScalarPair,
+) {
+    unsafe {
+        let buf = ByteAddressableBuffer::from_mut_slice(buf);
+        *scalar_pair = buf.load(5);
+    }
+}
+
+#[spirv(fragment)]
+pub fn store(
+    #[spirv(descriptor_set = 0, binding = 0, storage_buffer)] buf: &mut [u32],
+    #[spirv(flat)] pair0: i32,
+    #[spirv(flat)] pair1: i32,
+) {
+    unsafe {
+        let mut buf = ByteAddressableBuffer::from_mut_slice(buf);
+        buf.store(5, MyScalarPair(pair0, pair1));
+    }
+}