Support STORAGE_RESOURCE_BINDING_ARRAY on Metal

Author: msvbg

Cargo.lock

@@ -200,7 +200,7 @@ which = "8"
 xshell = "0.2.2"
 
 # Metal dependencies
-metal = "0.32"
+metal = { git = "https://github.com/msvbg/metal-rs", branch = "gpu_resource_id_for_buffer" }
 block = "0.1.6"
 core-graphics-types = "0.2"
 objc = "0.2.5"

Cargo.toml

@@ -7099,9 +7099,11 @@ template <typename A>
                                         }
                                     }
                                     crate::ImageClass::Storage { .. } => {
-                                        return Err(Error::UnsupportedArrayOf(
-                                            "read-write textures".to_string(),
-                                        ));
+                                        if options.lang_version < (3, 0) {
+                                            return Err(Error::UnsupportedArrayOf(
+                                                "read-write textures".to_string(),
+                                            ));
+                                        }
                                     }
                                     crate::ImageClass::External => {
                                         return Err(Error::UnsupportedArrayOf(

naga/src/back/msl/writer.rs

@@ -985,6 +985,13 @@ impl super::PrivateCapabilities {
                 && self.supports_arrays_of_textures
                 && self.argument_buffers as u64 >= MTLArgumentBuffersTier::Tier2 as u64,
         );
+        features.set(
+            F::STORAGE_RESOURCE_BINDING_ARRAY,
+            self.msl_version >= MTLLanguageVersion::V3_0
+                && self.supports_arrays_of_textures
+                && self.supports_arrays_of_textures_write
+                && self.argument_buffers as u64 >= MTLArgumentBuffersTier::Tier2 as u64,
+        );
         features.set(
             F::SHADER_INT64,
             self.int64 && self.msl_version >= MTLLanguageVersion::V2_3,

wgpu-hal/src/metal/adapter.rs

@@ -349,6 +349,16 @@ pub fn map_resource_usage(ty: &wgt::BindingType) -> MTLResourceUsage {
                 MTLResourceUsage::Read | MTLResourceUsage::Write
             }
         },
+        wgt::BindingType::Buffer { ty, .. } => match ty {
+            wgt::BufferBindingType::Uniform => MTLResourceUsage::Read,
+            wgt::BufferBindingType::Storage { read_only } => {
+                if *read_only {
+                    MTLResourceUsage::Read
+                } else {
+                    MTLResourceUsage::Read | MTLResourceUsage::Write
+                }
+            }
+        },
         wgt::BindingType::Sampler(..) => MTLResourceUsage::empty(),
         _ => unreachable!(),
     }

wgpu-hal/src/metal/conv.rs

@@ -905,6 +905,25 @@ impl crate::Device for super::Device {
                         };
 
                         match layout.ty {
+                            wgt::BindingType::Buffer { .. } => {
+                                let start = entry.resource_index as usize;
+                                let end = start + count as usize;
+                                let buffers = &desc.buffers[start..end];
+                                let compute_visible =
+                                    layout.visibility.contains(wgt::ShaderStages::COMPUTE);
+
+                                for (idx, buffer_binding) in buffers.iter().enumerate() {
+                                    contents[idx] = buffer_binding.buffer.raw.gpu_resource_id();
+
+                                    let use_info = bg
+                                        .resources_to_use
+                                        .entry(buffer_binding.buffer.as_raw().cast())
+                                        .or_default();
+                                    use_info.stages |= stages;
+                                    use_info.uses |= uses;
+                                    use_info.visible_in_compute |= compute_visible;
+                                }
+                            }
                             wgt::BindingType::Texture { .. }
                             | wgt::BindingType::StorageTexture { .. } => {
                                 let start = entry.resource_index as usize;