Synchronize surface release with GPU idle

aurora-main/cmake/AuroraSDL3Patches.cmake

@@ -32,52 +32,6 @@ function(aurora_sdl3_apply_patches sdl_source_dir)
   if (NOT EXISTS "${_wii}")
     message(FATAL_ERROR "aurora: SDL3 source tree at ${sdl_source_dir} has no SDL_hidapi_wii.c")
   endif ()
-  set(_rumble "${sdl_source_dir}/src/joystick/hidapi/SDL_hidapi_rumble.c")
-  if (NOT EXISTS "${_rumble}")
-    message(FATAL_ERROR "aurora: SDL3 source tree at ${sdl_source_dir} has no SDL_hidapi_rumble.c")
-  endif ()
-  set(_hidapi "${sdl_source_dir}/src/joystick/hidapi/SDL_hidapijoystick.c")
-  if (NOT EXISTS "${_hidapi}")
-    message(FATAL_ERROR "aurora: SDL3 source tree at ${sdl_source_dir} has no SDL_hidapijoystick.c")
-  endif ()
-
-  # Backport of SDL 71f4af732 (drop once SDL includes it): rumble writes must not hold dev_lock.
-  _aurora_sdl3_replace("${_rumble}" "HIDAPI rumble writes no longer hold the device lock"
-[==[        if (request) {
-            SDL_LockMutex(request->device->dev_lock);
-            if (request->device->dev) {
-#ifdef DEBUG_RUMBLE
-                HIDAPI_DumpPacket("Rumble packet: size = %d", request->data, request->size);
-#endif
-                SDL_hid_write(request->device->dev, request->data, request->size);
-            }
-            SDL_UnlockMutex(request->device->dev_lock);
-]==]
-[==[        if (request) {
-            if (request->device->dev) {
-#ifdef DEBUG_RUMBLE
-                HIDAPI_DumpPacket("Rumble packet: size = %d", request->data, request->size);
-#endif
-                SDL_hid_write(request->device->dev, request->data, request->size);
-            }
-]==])
-
-  # Without the lock, closing the handle must wait for in-flight rumble writes.
-  _aurora_sdl3_replace("${_hidapi}" "HIDAPI device close waits for pending rumble"
-[==[    device->driver->FreeDevice(device);
-    device->driver = NULL;
-
-    SDL_LockMutex(device->dev_lock);
-]==]
-[==[    device->driver->FreeDevice(device);
-    device->driver = NULL;
-
-    while (SDL_GetAtomicInt(&device->rumble_pending) > 0) {
-        SDL_Delay(10);
-    }
-
-    SDL_LockMutex(device->dev_lock);
-]==])
 
   # Wii Remote: rebuild the joystick in place after an extension change.
   #

aurora-main/lib/webgpu/gpu.cpp

@@ -893,9 +893,14 @@ void release_surface() noexcept {
   }
   g_surface = {};
   if (hadSurface && g_instance && g_device && g_queue) {
+    // Retired swapchain is freed after a later submission completes and the device ticks.
+    submit_staging_commands(g_device.CreateCommandEncoder().Finish());
     const auto future = g_queue.OnSubmittedWorkDone(
         wgpu::CallbackMode::WaitAnyOnly, [](wgpu::QueueWorkDoneStatus, wgpu::StringView) {});
-    g_instance.WaitAny(future, 1000000000);
+    if (const auto status = g_instance.WaitAny(future, 1000000000); status != wgpu::WaitStatus::Success) {
+      Log.warn("Timed out waiting for queue idle on surface release: {}", magic_enum::enum_name(status));
+    }
+    g_device.Tick();
   }
 }