Revert "Adds AccelerationStructureInstances::blases."

Author: Lichtso

wgpu-core/src/command/ray_tracing.rs

@@ -245,11 +245,6 @@ impl Global {
             });
         }
 
-        let blases = blas_storage
-            .iter()
-            .map(|storage| storage.blas.try_raw(&snatch_guard).unwrap())
-            .collect::<Vec<_>>();
-
         for tlas_buf in &mut tlas_buf_storage {
             let entry = &tlas_buf.entry;
             let instance_buffer = {
@@ -285,7 +280,6 @@ impl Global {
                 tlas,
                 entries: hal::AccelerationStructureEntries::Instances(
                     hal::AccelerationStructureInstances {
-                        blases: &blases,
                         buffer: Some(instance_buffer),
                         offset: 0,
                         count: entry.instance_count,
@@ -537,11 +531,6 @@ impl Global {
         let mut tlas_storage = Vec::<TlasStore>::new();
         let mut instance_buffer_staging_source = Vec::<u8>::new();
 
-        let blases = blas_storage
-            .iter()
-            .map(|storage| storage.blas.try_raw(&snatch_guard).unwrap())
-            .collect::<Vec<_>>();
-
         for (package, tlas) in &mut tlas_lock_store {
             let package = package.take().unwrap();
 
@@ -613,7 +602,6 @@ impl Global {
                     tlas: tlas.clone(),
                     entries: hal::AccelerationStructureEntries::Instances(
                         hal::AccelerationStructureInstances {
-                            blases: &blases,
                             buffer: Some(tlas.instance_buffer.as_ref()),
                             offset: 0,
                             count: instance_count,

wgpu-core/src/device/ray_tracing.rs

@@ -158,7 +158,6 @@ impl Device {
                 &hal::GetAccelerationStructureBuildSizesDescriptor {
                     entries: &hal::AccelerationStructureEntries::Instances(
                         hal::AccelerationStructureInstances {
-                            blases: &[],
                             buffer: None,
                             offset: 0,
                             count: desc.max_instances,

wgpu-hal/src/dynamic/mod.rs

@@ -161,7 +161,6 @@ impl<'a> AccelerationStructureEntries<'a, dyn DynBuffer> {
         match self {
             AccelerationStructureEntries::Instances(instances) => {
                 AccelerationStructureEntries::Instances(AccelerationStructureInstances {
-                    blases: instances.blases,
                     buffer: instances.buffer.map(|b| b.expect_downcast_ref()),
                     offset: instances.offset,
                     count: instances.count,

wgpu-hal/src/lib.rs

@@ -2517,7 +2517,6 @@ pub struct AccelerationStructureCopy {
 /// * `offset` - offset in bytes
 #[derive(Clone, Debug)]
 pub struct AccelerationStructureInstances<'a, B: DynBuffer + ?Sized> {
-    pub blases: &'a [&'a dyn DynAccelerationStructure],
     pub buffer: Option<&'a B>,
     pub offset: u32,
     pub count: u32,

wgpu-hal/src/metal/conv.rs

@@ -371,14 +371,6 @@ pub fn map_acceleration_structure_descriptor<'a>(
             descriptor.set_instance_descriptor_type(
                 metal::MTLAccelerationStructureInstanceDescriptorType::Indirect,
             );
-            let blases = instances
-                .blases
-                .iter()
-                .map(|blas| unsafe { &*blas.raw().cast::<metal::AccelerationStructure>() }.clone())
-                .collect::<std::vec::Vec<metal::AccelerationStructure>>();
-            descriptor.set_instanced_acceleration_structures(metal::Array::from_owned_slice(
-                blases.as_slice(),
-            ));
             descriptor.set_instance_count(instances.count as u64);
             if let Some(buffer) = instances.buffer {
                 descriptor.set_instance_descriptor_buffer(&buffer.raw);