Skip to content

Fix application freezing on macOS when trace_tracy is enabled #23201

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.

Sign up for GitHub

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

Open
xremming wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −0
Open

Fix application freezing on macOS when trace_tracy is enabled #23201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a86699
Short-circuit `initial_timestamp` call on macOS
xremming Mar 3, 2026
5099eb7
Merge branch 'main' into tracy-macos-freeze-fix
mockersf Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/bevy_render/src/diagnostic/tracy_gpu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ pub fn new_tracy_gpu_context(

// Code copied from https://github.com/Wumpf/wgpu-profiler/blob/f9de342a62cb75f50904a98d11dd2bbeb40ceab8/src/tracy.rs
fn initial_timestamp(device: &RenderDevice, queue: &RenderQueue) -> i64 {
if cfg!(target_os = "macos") {
// On macOS the `.poll(PollType::wait_indefinitely())` will never return
// and thus freezes the application before it even gets to start properly.
// I suspect this is related to the same root cause that was fixed in
// https://github.com/bevyengine/bevy/pull/22365 but I'm not sure.
//
// 0 is probably not correct, but it works.
return 0;
}

let query_set = device.wgpu_device().create_query_set(&QuerySetDescriptor {
label: None,
ty: QueryType::Timestamp,
Expand Down