nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix profiling with tracy. (#5988)

Browse Source 
The profiling APIs require a `&str`, but since the label here
is now an `Option<String>`, we must get a `&str` from it.

(cherry picked from commit 20973d1cdc)

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Bruce Mitchener 2024-07-19 11:56:16 +07:00 committed by Connor Fitzgerald
parent 908bab43b1
commit 0253a4f903
No known key found for this signature in database
GPG Key ID: CF0A1F83B4E1A995
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -49,6 +49,7 @@ Bottom level categories:
#### General #### General
- Fix profiling with `tracy`. By @waywardmonkeys in [#5988](https://github.com/gfx-rs/wgpu/pull/5988)
- Fix function for checking bind compatibility to error instead of panic. By @sagudev [#6012](https://github.com/gfx-rs/wgpu/pull/6012) - Fix function for checking bind compatibility to error instead of panic. By @sagudev [#6012](https://github.com/gfx-rs/wgpu/pull/6012)
- Fix crash when dropping the surface after the device. By @wumpf in [#6052](https://github.com/gfx-rs/wgpu/pull/6052) - Fix crash when dropping the surface after the device. By @wumpf in [#6052](https://github.com/gfx-rs/wgpu/pull/6052)
- Fix length of copy in `queue_write_texture`. By @teoxoy in [#6009](https://github.com/gfx-rs/wgpu/pull/6009) - Fix length of copy in `queue_write_texture`. By @teoxoy in [#6009](https://github.com/gfx-rs/wgpu/pull/6009)

2
wgpu-core/src/command/render.rs
View File

@ -1566,7 +1566,7 @@ impl Global {
profiling::scope!( profiling::scope!(
"CommandEncoder::run_render_pass {}", "CommandEncoder::run_render_pass {}",
base.label.unwrap_or("") base.label.as_deref().unwrap_or("")
); );
let Some(cmd_buf) = pass.parent.as_ref() else { let Some(cmd_buf) = pass.parent.as_ref() else {