Merge pull request #10151 from GPUCode/no-softlocks-please

Fix softlocks when disabling async present

src/video_core/renderer_vulkan/renderer_vulkan.cpp

@@ -134,7 +134,7 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
     Frame* frame = present_manager.GetRenderFrame();
     blit_screen.DrawToSwapchain(frame, *framebuffer, use_accelerated, is_srgb);
     scheduler.Flush(*frame->render_ready);
-    scheduler.Record([this, frame](vk::CommandBuffer) { present_manager.PushFrame(frame); });
+    present_manager.Present(frame);
 
     gpu.RendererFrameEndNotify();
     rasterizer.TickFrame();

src/video_core/renderer_vulkan/vk_present_manager.cpp

@@ -153,16 +153,19 @@ Frame* PresentManager::GetRenderFrame() {
     return frame;
 }
 
-void PresentManager::PushFrame(Frame* frame) {
+void PresentManager::Present(Frame* frame) {
     if (!use_present_thread) {
+        scheduler.WaitWorker();
         CopyToSwapchain(frame);
         free_queue.push(frame);
         return;
     }
 
-    std::unique_lock lock{queue_mutex};
+    scheduler.Record([this, frame](vk::CommandBuffer) {
-    present_queue.push(frame);
+        std::unique_lock lock{queue_mutex};
-    frame_cv.notify_one();
+        present_queue.push(frame);
+        frame_cv.notify_one();
+    });
 }
 
 void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb,

src/video_core/renderer_vulkan/vk_present_manager.h

@@ -45,7 +45,7 @@ public:
     Frame* GetRenderFrame();
 
     /// Pushes a frame for presentation
-    void PushFrame(Frame* frame);
+    void Present(Frame* frame);
 
     /// Recreates the present frame to match the provided parameters
     void RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb,