Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wgpu-core] ray tracing follow-up #6552

Merged
merged 6 commits into from
Jan 13, 2025
Merged

[wgpu-core] ray tracing follow-up #6552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2641f36
[wgpu-core] ray tracing: use error handling helpers
teoxoy Nov 15, 2024
691714d
[wgpu-core] ray tracing: remove acceleration structures from pending …
teoxoy Nov 15, 2024
744f3bb
add `temp_resources` to `CommandBufferMutable`, `BakedCommands` & `En…
teoxoy Nov 15, 2024
40c9e78
remove unused id
teoxoy Nov 15, 2024
86bff97
remove `Tlas`/`Blas` destroy methods
teoxoy Nov 15, 2024
5a21804
use `StatelessTracker` for acceleration structures
teoxoy Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions player/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,18 +451,12 @@ impl GlobalPlay for wgc::global::Global {
Action::CreateBlas { id, desc, sizes } => {
self.device_create_blas(device, &desc, sizes, Some(id));
}
Action::FreeBlas(id) => {
self.blas_destroy(id).unwrap();
}
Action::DestroyBlas(id) => {
self.blas_drop(id);
}
Action::CreateTlas { id, desc } => {
self.device_create_tlas(device, &desc, Some(id));
}
Action::FreeTlas(id) => {
self.tlas_destroy(id).unwrap();
}
Action::DestroyTlas(id) => {
self.tlas_drop(id);
}
Expand Down
5 changes: 5 additions & 0 deletions wgpu-core/src/command/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub use timestamp_writes::PassTimestampWrites;

use self::memory_init::CommandBufferTextureMemoryActions;

use crate::device::queue::TempResource;
use crate::device::{Device, DeviceError, MissingFeatures};
use crate::lock::{rank, Mutex};
use crate::snatch::SnatchGuard;
Expand Down Expand Up @@ -432,6 +433,7 @@ impl Drop for CommandEncoder {
pub(crate) struct BakedCommands {
pub(crate) encoder: CommandEncoder,
pub(crate) trackers: Tracker,
pub(crate) temp_resources: Vec<TempResource>,
buffer_memory_init_actions: Vec<BufferInitTrackerAction>,
texture_memory_actions: CommandBufferTextureMemoryActions,
}
Expand Down Expand Up @@ -460,6 +462,7 @@ pub struct CommandBufferMutable {

blas_actions: Vec<BlasAction>,
tlas_actions: Vec<TlasAction>,
temp_resources: Vec<TempResource>,

#[cfg(feature = "trace")]
pub(crate) commands: Option<Vec<TraceCommand>>,
Expand All @@ -479,6 +482,7 @@ impl CommandBufferMutable {
BakedCommands {
encoder: self.encoder,
trackers: self.trackers,
temp_resources: self.temp_resources,
buffer_memory_init_actions: self.buffer_memory_init_actions,
texture_memory_actions: self.texture_memory_actions,
}
Expand Down Expand Up @@ -545,6 +549,7 @@ impl CommandBuffer {
pending_query_resets: QueryResetMap::new(),
blas_actions: Default::default(),
tlas_actions: Default::default(),
temp_resources: Default::default(),
#[cfg(feature = "trace")]
commands: if device.trace.lock().is_some() {
Some(Vec::new())
Expand Down
Loading
Loading