Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
72 changes: 43 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wgpu-profiler"
version = "0.24.0"
version = "0.25.0"
authors = ["Andreas Reich <r_andreas2@web.de>"]
edition = "2021"
description = "Simple profiler scopes for wgpu using timer queries"
Expand All @@ -21,7 +21,7 @@ puffin = ["dep:puffin", "profiling/profile-with-puffin"]
[dependencies]
parking_lot = "0.12" # Used for Mutex & RwLock. Note that wgpu already depends on parking_lot as well.
thiserror = "2"
wgpu = { version = "26.0.0", default-features = false }
wgpu = { version = "27.0.0", default-features = false }

tracy-client = { version = "0.18", optional = true }
puffin = { version = "0.19.1", optional = true }
Expand All @@ -31,5 +31,5 @@ futures-lite = "2"
profiling = "1"
puffin_http = "0.16.1"
tracy-client = "0.18"
wgpu = { version = "26.0.0", default-features = true }
wgpu = { version = "27.0.0", default-features = true }
winit = "0.30"
2 changes: 1 addition & 1 deletion src/tracy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub fn create_tracy_gpu_client(
queue.submit([timestamp_encoder.finish(), copy_encoder.finish()]);

map_buffer.slice(..).map_async(wgpu::MapMode::Read, |_| ());
device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

let view = map_buffer.slice(..).get_mapped_range();
let timestamp: i64 = i64::from_le_bytes((*view).try_into().unwrap());
Expand Down
2 changes: 1 addition & 1 deletion tests/src/dropped_frame_handling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn handle_dropped_frames_gracefully() {
}

// Poll to explicitly trigger mapping callbacks.
device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

// A single (!) frame should now be available.
assert!(profiler
Expand Down
2 changes: 1 addition & 1 deletion tests/src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fn end_frame_unresolved_query() {
}
assert_eq!(profiler.end_frame(), Ok(()));

device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();
}

#[test]
Expand Down
4 changes: 2 additions & 2 deletions tests/src/interleaved_command_buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fn interleaved_scopes() {
queue.submit([encoder1.finish(), encoder0.finish()]);
profiler.end_frame().unwrap();

device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

// Single frame should now be available.
let frame = profiler
Expand Down Expand Up @@ -102,7 +102,7 @@ fn multithreaded_scopes() {
queue.submit([command_buffer0, command_buffer1, resolve_encoder.finish()]);
profiler.end_frame().unwrap();

device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

// Single frame should now be available.
let frame = profiler
Expand Down
2 changes: 1 addition & 1 deletion tests/src/multiple_resolves_per_frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn multiple_resolves_per_frame() {
}

// Poll to explicitly trigger mapping callbacks.
device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

// Frame should now be available and contain all the scopes.
let scopes = profiler
Expand Down
2 changes: 1 addition & 1 deletion tests/src/nested_scopes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fn nested_scopes(device: &wgpu::Device, queue: &wgpu::Queue) {
queue.submit([encoder0.finish(), encoder1.finish(), encoder2.finish()]);
profiler.end_frame().unwrap();

device.poll(wgpu::PollType::Wait).unwrap();
device.poll(wgpu::PollType::wait_indefinitely()).unwrap();

// Single frame should now be available.
let frame = profiler
Expand Down