Skip to content

Commit

Permalink
Fix profiling with tracy. (#5988)
Browse files Browse the repository at this point in the history
The profiling APIs require a `&str`, but since the label here
is now an `Option<String>`, we must get a `&str` from it.
  • Loading branch information
waywardmonkeys authored Jul 19, 2024
1 parent 8aed6ed commit 20973d1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ Bottom level categories:

## Unreleased

### Bug Fixes

#### General

- Fix profiling with `tracy`. By @waywardmonkeys in [#5988](https://github.com/gfx-rs/wgpu/pull/5988)

## 22.0.0 (2024-07-17)

### Overview
Expand Down
2 changes: 1 addition & 1 deletion wgpu-core/src/command/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ impl Global {

profiling::scope!(
"CommandEncoder::run_render_pass {}",
base.label.unwrap_or("")
base.label.as_deref().unwrap_or("")
);

let Some(cmd_buf) = pass.parent.as_ref() else {
Expand Down

0 comments on commit 20973d1

Please sign in to comment.