Skip to content

Commit 7728827

Browse files
committed
use StatelessTracker for acceleration structures
1 parent 617abc8 commit 7728827

File tree

3 files changed

+8
-85
lines changed

3 files changed

+8
-85
lines changed

wgpu-core/src/command/ray_tracing.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl Global {
223223
};
224224

225225
let tlas = hub.tlas_s.get(entry.tlas_id).get()?;
226-
cmd_buf_data.trackers.tlas_s.set_single(tlas.clone());
226+
cmd_buf_data.trackers.tlas_s.insert_single(tlas.clone());
227227

228228
cmd_buf_data.tlas_actions.push(TlasAction {
229229
tlas: tlas.clone(),
@@ -485,7 +485,7 @@ impl Global {
485485
for package in tlas_iter {
486486
let tlas = hub.tlas_s.get(package.tlas_id).get()?;
487487

488-
cmd_buf_data.trackers.tlas_s.set_single(tlas.clone());
488+
cmd_buf_data.trackers.tlas_s.insert_single(tlas.clone());
489489

490490
tlas_lock_store.push((Some(package), tlas))
491491
}
@@ -516,7 +516,7 @@ impl Global {
516516
}
517517
let blas = hub.blas_s.get(instance.blas_id).get()?;
518518

519-
cmd_buf_data.trackers.blas_s.set_single(blas.clone());
519+
cmd_buf_data.trackers.blas_s.insert_single(blas.clone());
520520

521521
instance_buffer_staging_source.extend(device.raw().tlas_instance_to_bytes(
522522
hal::TlasInstance {
@@ -803,7 +803,7 @@ fn iter_blas<'a>(
803803
let mut temp_buffer = Vec::new();
804804
for entry in blas_iter {
805805
let blas = hub.blas_s.get(entry.blas_id).get()?;
806-
cmd_buf_data.trackers.blas_s.set_single(blas.clone());
806+
cmd_buf_data.trackers.blas_s.insert_single(blas.clone());
807807

808808
cmd_buf_data.blas_actions.push(BlasAction {
809809
blas: blas.clone(),

wgpu-core/src/track/mod.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ Device <- CommandBuffer = insert(device.start, device.end, buffer.start, buffer.
9898
mod buffer;
9999
mod metadata;
100100
mod range;
101-
mod ray_tracing;
102101
mod stateless;
103102
mod texture;
104103

@@ -113,7 +112,6 @@ use crate::{
113112
use std::{fmt, ops, sync::Arc};
114113
use thiserror::Error;
115114

116-
use crate::track::ray_tracing::AccelerationStructureTracker;
117115
pub(crate) use buffer::{
118116
BufferBindGroupState, BufferTracker, BufferUsageScope, DeviceBufferTracker,
119117
};
@@ -602,8 +600,8 @@ impl DeviceTracker {
602600
pub(crate) struct Tracker {
603601
pub buffers: BufferTracker,
604602
pub textures: TextureTracker,
605-
pub blas_s: AccelerationStructureTracker<resource::Blas>,
606-
pub tlas_s: AccelerationStructureTracker<resource::Tlas>,
603+
pub blas_s: StatelessTracker<resource::Blas>,
604+
pub tlas_s: StatelessTracker<resource::Tlas>,
607605
pub views: StatelessTracker<resource::TextureView>,
608606
pub bind_groups: StatelessTracker<binding_model::BindGroup>,
609607
pub compute_pipelines: StatelessTracker<pipeline::ComputePipeline>,
@@ -617,8 +615,8 @@ impl Tracker {
617615
Self {
618616
buffers: BufferTracker::new(),
619617
textures: TextureTracker::new(),
620-
blas_s: AccelerationStructureTracker::new(),
621-
tlas_s: AccelerationStructureTracker::new(),
618+
blas_s: StatelessTracker::new(),
619+
tlas_s: StatelessTracker::new(),
622620
views: StatelessTracker::new(),
623621
bind_groups: StatelessTracker::new(),
624622
compute_pipelines: StatelessTracker::new(),

wgpu-core/src/track/ray_tracing.rs

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)