Skip to content

Commit

Permalink
Update to puffin 0.19 (#3940)
Browse files Browse the repository at this point in the history
…and some other smaller crate updates
  • Loading branch information
emilk authored Feb 1, 2024
1 parent dda9f79 commit 948db61
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
27 changes: 14 additions & 13 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl Plugins {
callback,
} in callbacks
{
crate::profile_scope!(_name);
crate::profile_scope!("plugin", _name);
(callback)(ctx);
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/egui_demo_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
4 changes: 2 additions & 2 deletions examples/puffin_profiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 948db61

Please sign in to comment.