Skip to content

Commit

Permalink
renderer_vulkan: Fix deadlock when resizing the SDL window
Browse files Browse the repository at this point in the history
  • Loading branch information
ngoquang2708 committed Dec 28, 2024
1 parent 122fe22 commit 5c23a8e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
17 changes: 14 additions & 3 deletions src/video_core/renderer_vulkan/vk_presenter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,22 @@ 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 the frame for reuse
std::scoped_lock fl{free_mutex};
free_queue.push(frame);
free_cv.notify_one();
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();
Expand Down Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions src/video_core/renderer_vulkan/vk_swapchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 5c23a8e

Please sign in to comment.