refactor tlas builder

vulkano-rs · Dec 17, 2024 · 474c556 · 474c556
1 parent 2efe76a
commit 474c556
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/examples/ray-tracing-auto/scene.rs b/examples/ray-tracing-auto/scene.rs
@@ -179,7 +179,10 @@ impl Scene {
 
         let tlas = unsafe {
             build_top_level_acceleration_structure(
-                blas.clone(),
+                vec![AccelerationStructureInstance {
+                    acceleration_structure_reference: blas.device_address().into(),
+                    ..Default::default()
+                }],
                 memory_allocator.clone(),
                 command_buffer_allocator.clone(),
                 app.device.clone(),
@@ -436,17 +439,13 @@ unsafe fn build_acceleration_structure_triangles(
 }
 
 unsafe fn build_top_level_acceleration_structure(
-    acceleration_structure: Arc<AccelerationStructure>,
+    as_instances: Vec<AccelerationStructureInstance>,
     allocator: Arc<dyn MemoryAllocator>,
     command_buffer_allocator: Arc<dyn CommandBufferAllocator>,
     device: Arc<Device>,
     queue: Arc<Queue>,
 ) -> Arc<AccelerationStructure> {
-    let as_instance = AccelerationStructureInstance {
-        acceleration_structure_reference: acceleration_structure.device_address().into(),
-        ..Default::default()
-    };
-
+    let primitive_count = as_instances.len() as u32;
     let instance_buffer = Buffer::from_iter(
         allocator.clone(),
         BufferCreateInfo {
@@ -459,7 +458,7 @@ unsafe fn build_top_level_acceleration_structure(
                 | MemoryTypeFilter::HOST_SEQUENTIAL_WRITE,
             ..Default::default()
         },
-        [as_instance],
+        as_instances,
     )
     .unwrap();
 
@@ -471,7 +470,7 @@ unsafe fn build_top_level_acceleration_structure(
 
     build_acceleration_structure_common(
         geometries,
-        1,
+        primitive_count,
         AccelerationStructureType::TopLevel,
         allocator,
         command_buffer_allocator,

diff --git a/examples/ray-tracing/scene.rs b/examples/ray-tracing/scene.rs
@@ -176,7 +176,10 @@ impl SceneTask {
 
         let tlas = unsafe {
             build_top_level_acceleration_structure(
-                blas.clone(),
+                vec![AccelerationStructureInstance {
+                    acceleration_structure_reference: blas.device_address().into(),
+                    ..Default::default()
+                }],
                 memory_allocator.clone(),
                 command_buffer_allocator.clone(),
                 app.device.clone(),
@@ -454,17 +457,13 @@ unsafe fn build_acceleration_structure_triangles(
 }
 
 unsafe fn build_top_level_acceleration_structure(
-    acceleration_structure: Arc<AccelerationStructure>,
+    as_instances: Vec<AccelerationStructureInstance>,
     allocator: Arc<dyn MemoryAllocator>,
     command_buffer_allocator: Arc<dyn CommandBufferAllocator>,
     device: Arc<Device>,
     queue: Arc<Queue>,
 ) -> Arc<AccelerationStructure> {
-    let as_instance = AccelerationStructureInstance {
-        acceleration_structure_reference: acceleration_structure.device_address().into(),
-        ..Default::default()
-    };
-
+    let primitive_count = as_instances.len() as u32;
     let instance_buffer = Buffer::from_iter(
         allocator.clone(),
         BufferCreateInfo {
@@ -477,7 +476,7 @@ unsafe fn build_top_level_acceleration_structure(
                 | MemoryTypeFilter::HOST_SEQUENTIAL_WRITE,
             ..Default::default()
         },
-        [as_instance],
+        as_instances,
     )
     .unwrap();
 
@@ -489,7 +488,7 @@ unsafe fn build_top_level_acceleration_structure(
 
     build_acceleration_structure_common(
         geometries,
-        1,
+        primitive_count,
         AccelerationStructureType::TopLevel,
         allocator,
         command_buffer_allocator,