diff --git a/Cargo.lock b/Cargo.lock index af293f56a78..c2e0bdf30c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1161,7 +1161,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.7.4", ] [[package]] @@ -1816,9 +1816,9 @@ dependencies = [ [[package]] name = "glutin" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca18d477e18c996c1fd1a50e04c6a745b67e2d512c7fb51f2757d9486a0e3ee" +checksum = "005459a22af86adc706522d78d360101118e2638ec21df3852fcc626e0dbb212" dependencies = [ "bitflags 2.4.0", "cfg_aliases", @@ -1985,7 +1985,7 @@ dependencies = [ "bitflags 2.4.0", "com", "libc", - "libloading 0.8.0", + "libloading 0.7.4", "thiserror", "widestring", "winapi", @@ -2907,15 +2907,15 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" [[package]] name = "puffin" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0b84517b2fb755da3a634bc030fcbc7b6337a786aa25a7fb350cdd51ab5e15" +checksum = "b9f76ad4bb049fded4e572df72cbb6381ff5d1f41f85c3a04b56e4eca287a02f" dependencies = [ "anyhow", "bincode", @@ -2929,13 +2929,14 @@ dependencies = [ [[package]] name = "puffin_http" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf8e52cf00569807b02e8089a85e859c00476182730cda9718c94b12cdc31b8" +checksum = "4936c085e48efc86f6d96609dc5086d1d236afe3ec4676f09b157a4f4be83ff6" dependencies = [ "anyhow", "crossbeam-channel", "log", + "parking_lot", "puffin", ] @@ -4313,7 +4314,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.0", + "libloading 0.7.4", "log", "metal", "naga", @@ -4584,9 +4585,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" -version = "0.29.7" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd430cd4560ee9c48885a4ef473b609a56796e37b1e18222abee146143f7457" +checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" dependencies = [ "ahash", "android-activity", diff --git a/Cargo.toml b/Cargo.toml index 977c1d9a39d..0ed6d93a93e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,8 @@ opt-level = 2 [workspace.dependencies] criterion = { version = "0.5.1", default-features = false } glow = "0.13" -puffin = "0.18" +puffin = "0.19" +puffin_http = "0.16" raw-window-handle = "0.6.0" thiserror = "1.0.37" web-time = "0.2" # Timekeeping for native and web diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs index 0f63521f1d0..8cef0f2dc70 100644 --- a/crates/egui/src/context.rs +++ b/crates/egui/src/context.rs @@ -90,7 +90,7 @@ impl Plugins { callback, } in callbacks { - crate::profile_scope!(_name); + crate::profile_scope!("plugin", _name); (callback)(ctx); } } diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml index 143fe8271fe..68ac22a03dc 100644 --- a/crates/egui_demo_app/Cargo.toml +++ b/crates/egui_demo_app/Cargo.toml @@ -53,8 +53,8 @@ log = { version = "0.4", features = ["std"] } # Optional dependencies: bytemuck = { version = "1.7.1", optional = true } -puffin = { version = "0.18", optional = true } -puffin_http = { version = "0.15", optional = true } +puffin = { workspace = true, optional = true } +puffin_http = { workspace = true, optional = true } # Enable both WebGL & WebGPU when targeting the web (these features have no effect when not targeting wasm32) wgpu = { workspace = true, features = ["webgpu", "webgl"], optional = true } diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index d1329f9f31b..4b7b2e9b4bb 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -21,5 +21,5 @@ env_logger = { version = "0.10", default-features = false, features = [ "auto-color", "humantime", ] } -puffin = "0.18" -puffin_http = "0.15" +puffin = "0.19" +puffin_http = "0.16"