Skip to content

fix: set surface event before SetFormat to prevent draw thread deadlock #356

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

Merged
winnerspiros merged 2 commits into from
May 23, 2026
Merged

fix: set surface event before SetFormat to prevent draw thread deadlock #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dd8eeb
fix: set surface event before SetFormat to prevent draw thread deadlock
May 23, 2026
fb435de
fix: set surface event AFTER SetFormat to preserve draw thread invariant
May 23, 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
20 changes: 9 additions & 11 deletions osu.Android/OsuGameActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,11 +906,6 @@ public void SurfaceChanged(ISurfaceHolder holder, global::Android.Graphics.Forma
// to send a heartbeat (especially during startup when the runtime is under
// heavy load), and the native watchdog (10s default) would fire, killing the
// process and producing a black screen.
//
// Calling Heartbeat() here resets the watchdog timer from the UI thread,
// giving SetFormat time to complete without triggering a false positive.
// The native watchdog checks g_lastHeartbeatMonotonicSec which is updated
// by a simple atomic store — safe to call from any thread.
try
{
NativeWatchdog.Heartbeat();
Expand All @@ -921,6 +916,8 @@ public void SurfaceChanged(ISurfaceHolder holder, global::Android.Graphics.Forma
Debug.WriteLine($"[osu!] NativeWatchdog.Heartbeat failed (non-fatal): {e.Message}");
}

Debug.WriteLine("[osu!] Native surface format change requested (RGB565→RGBA8888)");

try
{
holder.SetFormat(global::Android.Graphics.Format.Rgba8888);
Expand All @@ -930,12 +927,13 @@ public void SurfaceChanged(ISurfaceHolder holder, global::Android.Graphics.Forma
Debug.WriteLine($"[osu!] Failed to request RGBA8888 format change for Vulkan: {e.Message}");
}

Debug.WriteLine("[osu!] Native surface format change requested (RGB565→RGBA8888)");

// Reset the surface event so GetSurfaceGlobalRef() does NOT unblock with the
// old (about-to-be-invalidated) surface handle. The event will be re-set when
// SurfaceChanged fires again for the new RGBA8888 surface.
surfaceEvent.Reset();
// After SetFormat returns, the synchronous SurfaceDestroyed→SurfaceCreated→SurfaceChanged
// cycle has already completed and surfaceGlobalRef points to the new RGBA8888 surface.
// Set the event now so GetSurfaceGlobalRef() returns the new valid surface.
// This preserves the invariant that surfaceEvent is only set when surfaceGlobalRef
// points to a safe-to-render surface, while the watchdog heartbeat above prevents
// a false positive during the blocking SetFormat call.
surfaceEvent.Set();

return;
}
Expand Down
Loading