Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix profiling with tracy. #5988

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

waywardmonkeys
Copy link
Contributor

@waywardmonkeys waywardmonkeys commented Jul 19, 2024

Connections

Description
Building with tracy support results in a compilation error.

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

Testing
It builds now.

  • Run cargo fmt.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown
    • --target wasm32-unknown-emscripten
  • Run cargo xtask test to run tests.
  • Add change to CHANGELOG.md. See simple instructions inside file.

@waywardmonkeys waywardmonkeys requested a review from a team as a code owner July 19, 2024 03:21
The profiling APIs require a `&str`, but since the label here
is now an `Option<String>`, we must get a `&str` from it.
@waywardmonkeys
Copy link
Contributor Author

This should get something added to test it in CI to prevent future breakage.

Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noice!

@cwfitzgerald cwfitzgerald merged commit 20973d1 into gfx-rs:trunk Jul 19, 2024
27 checks passed
@waywardmonkeys waywardmonkeys deleted the fix-profiling-with-tracy branch July 19, 2024 04:57
@Wumpf
Copy link
Member

Wumpf commented Jul 19, 2024

good candidate for a patch release

@torokati44
Copy link
Contributor

Can we expect a lil patch release with this in it sometime in the near future? 👀

@cwfitzgerald
Copy link
Member

Yeah, hopefully within the week

@torokati44
Copy link
Contributor

continued inquiring look 👀

cwfitzgerald pushed a commit to cwfitzgerald/wgpu that referenced this pull request Jul 31, 2024
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 20973d1)

# Conflicts:
#	CHANGELOG.md
@cwfitzgerald
Copy link
Member

Now in https://github.com/gfx-rs/wgpu/releases/tag/v22.1.0 :)

@torokati44
Copy link
Contributor

Yay! ^^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: needs back-porting PR with a fix that needs to land on crates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants