Switches to MTLIndirectAccelerationStructureInstanceDescriptor.

Author: Lichtso

wgpu-hal/src/metal/adapter.rs

@@ -1083,8 +1083,9 @@ impl super::PrivateCapabilities {
                 // Metal Shading Language it generates, so from `wgpu_hal`'s
                 // users' point of view, references are tightly checked.
                 uniform_bounds_check_alignment: wgt::BufferSize::new(1).unwrap(),
-                raw_tlas_instance_size: size_of::<metal::MTLAccelerationStructureInstanceDescriptor>(
-                ),
+                raw_tlas_instance_size: size_of::<
+                    metal::MTLIndirectAccelerationStructureInstanceDescriptor,
+                >(),
                 ray_tracing_scratch_buffer_alignment: 1,
             },
             downlevel,

wgpu-hal/src/metal/conv.rs

@@ -368,7 +368,9 @@ pub fn map_acceleration_structure_descriptor<'a>(
     match entries {
         crate::AccelerationStructureEntries::Instances(instances) => {
             let descriptor = metal::InstanceAccelerationStructureDescriptor::descriptor();
-            // descriptor.set_instance_descriptor_type(ty: MTLAccelerationStructureInstanceDescriptorType);
+            descriptor.set_instance_descriptor_type(
+                metal::MTLAccelerationStructureInstanceDescriptorType::Indirect,
+            );
             let blases = instances
                 .blases
                 .iter()

wgpu-hal/src/metal/device.rs

@@ -1632,9 +1632,9 @@ impl crate::Device for super::Device {
 
     unsafe fn get_acceleration_structure_device_address(
         &self,
-        _acceleration_structure: &super::AccelerationStructure,
+        acceleration_structure: &super::AccelerationStructure,
     ) -> wgt::BufferAddress {
-        unimplemented!()
+        acceleration_structure.raw.gpu_resource_id()._impl
     }
 
     unsafe fn create_acceleration_structure(
@@ -1656,7 +1656,7 @@ impl crate::Device for super::Device {
     }
 
     fn tlas_instance_to_bytes(&self, instance: TlasInstance) -> Vec<u8> {
-        let temp = metal::MTLAccelerationStructureInstanceDescriptor {
+        let temp = metal::MTLIndirectAccelerationStructureInstanceDescriptor {
             transformation_matrix: [
                 [
                     instance.transform[0],
@@ -1680,12 +1680,13 @@ impl crate::Device for super::Device {
                 ],
             ],
             options: metal::MTLAccelerationStructureInstanceOptions::None,
-            mask: (instance.custom_data << 8) | instance.mask as u32,
+            mask: instance.mask as u32,
             intersection_function_table_offset: 0,
-            acceleration_structure_index: instance.blas_address as u32,
+            acceleration_structure_id: instance.blas_address,
+            user_id: instance.custom_data,
         };
 
-        wgt::bytemuck_wrapper!(unsafe struct Desc(metal::MTLAccelerationStructureInstanceDescriptor));
+        wgt::bytemuck_wrapper!(unsafe struct Desc(metal::MTLIndirectAccelerationStructureInstanceDescriptor));
 
         bytemuck::bytes_of(&Desc::wrap(temp)).to_vec()
     }