From 1bc27135e33b057702d0fe673f48b9eb29cc8e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quang=20Ng=C3=B4?= <ngoquang2708@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:22:35 +0700
Subject: [PATCH] renderer_vulkan: fix deadlock when resizing the SDL window
 (#1860)

* renderer_vulkan: Fix deadlock when resizing the SDL window

* Address review comment
---
 .../renderer_vulkan/vk_presenter.cpp          | 27 +++++++++++++------
 .../renderer_vulkan/vk_swapchain.cpp          |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_presenter.cpp b/src/video_core/renderer_vulkan/vk_presenter.cpp
index bc55cde23..93129842f 100644
--- a/src/video_core/renderer_vulkan/vk_presenter.cpp
+++ b/src/video_core/renderer_vulkan/vk_presenter.cpp
@@ -628,6 +628,13 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
 }
 
 void Presenter::Present(Frame* frame) {
+    // Free the frame for reuse
+    const auto free_frame = [&] {
+        std::scoped_lock fl{free_mutex};
+        free_queue.push(frame);
+        free_cv.notify_one();
+    };
+
     // Recreate the swapchain if the window was resized.
     if (window.GetWidth() != swapchain.GetExtent().width ||
         window.GetHeight() != swapchain.GetExtent().height) {
@@ -636,8 +643,19 @@ void Presenter::Present(Frame* frame) {
 
     if (!swapchain.AcquireNextImage()) {
         swapchain.Recreate(window.GetWidth(), window.GetHeight());
+        if (!swapchain.AcquireNextImage()) {
+            // User resizes the window too fast and GPU can't keep up. Skip this frame.
+            LOG_WARNING(Render_Vulkan, "Skipping frame!");
+            free_frame();
+            return;
+        }
     }
 
+    // Reset fence for queue submission. Do it here instead of GetRenderFrame() because we may
+    // skip frame because of slow swapchain recreation. If a frame skip occurs, we skip signal
+    // the frame's present fence and future GetRenderFrame() call will hang waiting for this frame.
+    instance.GetDevice().resetFences(frame->present_done);
+
     ImGui::Core::NewFrame();
 
     const vk::Image swapchain_image = swapchain.Image();
@@ -737,11 +755,7 @@ void Presenter::Present(Frame* frame) {
         swapchain.Recreate(window.GetWidth(), window.GetHeight());
     }
 
-    // Free the frame for reuse
-    std::scoped_lock fl{free_mutex};
-    free_queue.push(frame);
-    free_cv.notify_one();
-
+    free_frame();
     DebugState.IncFlipFrameNum();
 }
 
@@ -776,9 +790,6 @@ Frame* Presenter::GetRenderFrame() {
         }
     }
 
-    // Reset fence for next queue submission.
-    device.resetFences(frame->present_done);
-
     // If the window dimensions changed, recreate this frame
     if (frame->width != window.GetWidth() || frame->height != window.GetHeight()) {
         RecreateFrame(frame, window.GetWidth(), window.GetHeight());
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp
index 380660a2f..44f4be6dd 100644
--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp
+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp
@@ -84,6 +84,7 @@ void Swapchain::Create(u32 width_, u32 height_, vk::SurfaceKHR surface_) {
 }
 
 void Swapchain::Recreate(u32 width_, u32 height_) {
+    LOG_DEBUG(Render_Vulkan, "Recreate the swapchain: width={} height={}", width_, height_);
     Create(width_, height_, surface);
 }