diff --git a/Cargo.lock b/Cargo.lock index bffbe48..a63bd2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,9 +156,6 @@ name = "bitflags" version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" -dependencies = [ - "serde", -] [[package]] name = "block" @@ -456,6 +453,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.5.0" @@ -615,7 +618,7 @@ checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ "bitflags 2.9.1", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.15.4", ] [[package]] @@ -644,7 +647,16 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ - "foldhash", + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +dependencies = [ + "foldhash 0.2.0", ] [[package]] @@ -666,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.4", ] [[package]] @@ -756,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.53.2", ] [[package]] @@ -879,9 +891,9 @@ dependencies = [ [[package]] name = "naga" -version = "26.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c" +checksum = "12b2e757b11b47345d44e7760e45458339bc490463d9548cd8651c53ae523153" dependencies = [ "arrayvec", "bit-set", @@ -890,7 +902,7 @@ dependencies = [ "cfg_aliases", "codespan-reporting", "half", - "hashbrown", + "hashbrown 0.16.0", "hexf-parse", "indexmap", "libm", @@ -1869,7 +1881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9612d9503675b07b244922ea6f6f3cdd88c43add1b3498084613fc88cdf69d" dependencies = [ "cc", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2129,16 +2141,16 @@ dependencies = [ [[package]] name = "wgpu" -version = "26.0.1" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798" +checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" dependencies = [ "arrayvec", "bitflags 2.9.1", "cfg-if", "cfg_aliases", "document-features", - "hashbrown", + "hashbrown 0.16.0", "js-sys", "log", "naga", @@ -2158,17 +2170,18 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "26.0.1" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9" +checksum = "e3d654c0b6c6335edfca18c11bdaed964def641b8e9997d3a495a2ff4077c922" dependencies = [ "arrayvec", "bit-set", "bit-vec", "bitflags 2.9.1", + "bytemuck", "cfg_aliases", "document-features", - "hashbrown", + "hashbrown 0.16.0", "indexmap", "log", "naga", @@ -2189,36 +2202,36 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "26.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf" +checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "26.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" +checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "26.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14" +checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "26.0.0" +version = "27.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2971a6c8b903aa9951cf3f3e4d8060904f8c8e905c11f7f5b228edf7faddb719" +checksum = "2618a2d6b8a5964ecc1ac32a5db56cb3b1e518725fcd773fd9a782e023453f2b" dependencies = [ "android_system_properties", "arrayvec", @@ -2235,7 +2248,7 @@ dependencies = [ "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hashbrown", + "hashbrown 0.16.0", "js-sys", "khronos-egl", "libc", @@ -2245,6 +2258,7 @@ dependencies = [ "naga", "ndk-sys", "objc", + "once_cell", "ordered-float", "parking_lot", "portable-atomic", @@ -2264,7 +2278,7 @@ dependencies = [ [[package]] name = "wgpu-profiler" -version = "0.24.0" +version = "0.25.0" dependencies = [ "futures-lite", "parking_lot", @@ -2279,9 +2293,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "26.0.0" +version = "27.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2" +checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" dependencies = [ "bitflags 2.9.1", "bytemuck", diff --git a/Cargo.toml b/Cargo.toml index 2c1e88c..9335eff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-profiler" -version = "0.24.0" +version = "0.25.0" authors = ["Andreas Reich "] edition = "2021" description = "Simple profiler scopes for wgpu using timer queries" @@ -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 } @@ -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" diff --git a/src/tracy.rs b/src/tracy.rs index 9abdd1e..84062f8 100644 --- a/src/tracy.rs +++ b/src/tracy.rs @@ -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()); diff --git a/tests/src/dropped_frame_handling.rs b/tests/src/dropped_frame_handling.rs index 343f4cf..444755f 100644 --- a/tests/src/dropped_frame_handling.rs +++ b/tests/src/dropped_frame_handling.rs @@ -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 diff --git a/tests/src/errors.rs b/tests/src/errors.rs index 62abaf3..3c00cff 100644 --- a/tests/src/errors.rs +++ b/tests/src/errors.rs @@ -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] diff --git a/tests/src/interleaved_command_buffer.rs b/tests/src/interleaved_command_buffer.rs index 6db44e4..73ef9f2 100644 --- a/tests/src/interleaved_command_buffer.rs +++ b/tests/src/interleaved_command_buffer.rs @@ -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 @@ -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 diff --git a/tests/src/multiple_resolves_per_frame.rs b/tests/src/multiple_resolves_per_frame.rs index 1bee03f..bf82254 100644 --- a/tests/src/multiple_resolves_per_frame.rs +++ b/tests/src/multiple_resolves_per_frame.rs @@ -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 diff --git a/tests/src/nested_scopes.rs b/tests/src/nested_scopes.rs index e2bbc80..fecbd67 100644 --- a/tests/src/nested_scopes.rs +++ b/tests/src/nested_scopes.rs @@ -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