Features and Partial Binding

Author: cwfitzgerald

wgpu-hal/src/metal/adapter.rs

@@ -905,18 +905,10 @@ impl super::PrivateCapabilities {
         features.set(
             F::TEXTURE_BINDING_ARRAY
                 | F::SAMPLED_TEXTURE_AND_STORAGE_BUFFER_ARRAY_NON_UNIFORM_INDEXING
-                | F::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING,
-            self.msl_version >= MTLLanguageVersion::V2_0 && self.supports_arrays_of_textures,
+                | F::UNIFORM_BUFFER_AND_STORAGE_TEXTURE_ARRAY_NON_UNIFORM_INDEXING
+                | F::PARTIALLY_BOUND_BINDING_ARRAY,
+            self.msl_version >= MTLLanguageVersion::V3_0 && self.supports_arrays_of_textures,
         );
-        //// XXX: this is technically not true, as read-only storage images can be used in arrays
-        //// on precisely the same conditions that sampled textures can. But texel fetch from a
-        //// sampled texture is a thing; should we bother introducing another feature flag?
-        if self.msl_version >= MTLLanguageVersion::V2_2
-            && self.supports_arrays_of_textures
-            && self.supports_arrays_of_textures_write
-        {
-            features.insert(F::STORAGE_RESOURCE_BINDING_ARRAY);
-        }
         features.set(
             F::SHADER_INT64,
             self.int64 && self.msl_version >= MTLLanguageVersion::V2_3,

wgpu-hal/src/metal/device.rs

@@ -564,6 +564,9 @@ impl crate::Device for super::Device {
             if let Some(label) = desc.label {
                 descriptor.set_label(label);
             }
+            if self.features.contains(wgt::Features::TEXTURE_BINDING_ARRAY) {
+                descriptor.set_support_argument_buffers(true);
+            }
             let raw = self.shared.device.lock().new_sampler(&descriptor);
 
             self.counters.samplers.add(1);
@@ -810,8 +813,8 @@ impl crate::Device for super::Device {
                 });
                 for (entry, layout) in layout_and_entry_iter {
                     // Bindless path
-                    if let Some(count) = layout.count {
-                        let count = count.get();
+                    if layout.count.is_some() {
+                        let count = entry.count;
 
                         let stages = conv::map_render_stages(layout.visibility);
                         let uses = conv::map_resource_usage(&layout.ty);
@@ -823,7 +826,9 @@ impl crate::Device for super::Device {
                                 | metal::MTLResourceOptions::StorageModeShared,
                         );
 
-                        let contents: *mut metal::MTLResourceID = buffer.contents().cast();
+                        let contents: &mut [metal::MTLResourceID] = unsafe {
+                            std::slice::from_raw_parts_mut(buffer.contents().cast(), count as usize)
+                        };
 
                         match layout.ty {
                             wgt::BindingType::Texture { .. }
@@ -833,9 +838,7 @@ impl crate::Device for super::Device {
                                 let textures = &desc.textures[start..end];
 
                                 for (idx, tex) in textures.iter().enumerate() {
-                                    unsafe {
-                                        contents.add(idx).write(tex.view.raw.gpu_resource_id())
-                                    }
+                                    contents[idx] = tex.view.raw.gpu_resource_id();
 
                                     let use_info = bg
                                         .resources_to_use
@@ -852,13 +855,8 @@ impl crate::Device for super::Device {
                                 let end = start + count as usize;
                                 let samplers = &desc.samplers[start..end];
 
-                                dbg!(samplers);
-
                                 for (idx, &sampler) in samplers.iter().enumerate() {
-                                    dbg!(sampler);
-                                    unsafe {
-                                        contents.add(idx).write(dbg!(sampler.raw.gpu_resource_id()))
-                                    }
+                                    contents[idx] = sampler.raw.gpu_resource_id();
                                     // Samplers aren't resources like buffers and textures, so don't
                                     // need to be passed to useResource
                                 }