Fix SIGSEGV on Android startup from null Vulkan surface handle

[Copilot]

Android native SurfaceView isn't guaranteed to exist when the SDL thread starts the game loop. AndroidGameWindow.SurfaceHandle returns IntPtr.Zero, which propagates through VeldridDevice → VkSurfaceUtil.createAndroidSurface → ANativeWindow_fromSurface(null) → SIGSEGV at pc=0x0 inside the Vulkan driver.

Changes

Three-layer defense, all in the osu-framework submodule:

• VeldridDevice.cs — Poll-wait up to 5s for the Android surface handle to become non-zero before creating the swapchain. This is the primary fix; the surface is typically ready within a few hundred ms.
• VkSurfaceUtil.cs — Null-check ANativeWindow after ANativeWindow_fromSurface and throw a descriptive VeldridException instead of letting the driver SIGSEGV.
• DrawThread.cs — Wrap initial BeginFrame/FinishFrame in try-catch so the draw loop can defer gracefully if the surface still isn't ready.

// VeldridDevice.cs — core fix
IntPtr surfaceHandle = androidGraphics.SurfaceHandle;

const int max_wait_ms = 5000;
const int poll_interval_ms = 50;
int waited = 0;

while (surfaceHandle == IntPtr.Zero && waited < max_wait_ms)
{
    Thread.Sleep(poll_interval_ms);
    waited += poll_interval_ms;
    surfaceHandle = androidGraphics.SurfaceHandle;
}

if (surfaceHandle == IntPtr.Zero)
    throw new InvalidOperationException("Android surface handle was not available within the timeout period.");

[gitar-bot]

Important

You are using the Gitar free plan. Upgrade to unlock code review, CI analysis, auto-apply, custom automations, and more.

_Gitar

[Copilot]

Pull request overview

Updates the osu-framework submodule to incorporate upstream fixes that prevent an Android startup SIGSEGV caused by a null/zero Vulkan surface handle during early window/surface initialization.

Changes:

• Bump submodules/osu-framework to a commit containing a three-layer mitigation (poll/wait in swapchain creation, native surface null-guard with a managed exception, and draw-thread BeginFrame deferral).

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.