VERY experimental Nintendo Switch 2 emulator
C++
vk_present_manager: Fix softlocks when disabling async present
GPUCode40fa53e6d7f6
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cppindex 69dc76180d..908625c66d 100644--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp+++ b/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();diff --git a/src/video_core/renderer_vulkan/vk_present_manager.cpp b/src/video_core/renderer_vulkan/vk_present_manager.cppindex a137c66f29..c495830136 100644--- a/src/video_core/renderer_vulkan/vk_present_manager.cpp+++ b/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};- present_queue.push(frame);- frame_cv.notify_one();+ scheduler.Record([this, frame](vk::CommandBuffer) {+ std::unique_lock lock{queue_mutex};+ present_queue.push(frame);+ frame_cv.notify_one();+ });}void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb,diff --git a/src/video_core/renderer_vulkan/vk_present_manager.h b/src/video_core/renderer_vulkan/vk_present_manager.hindex 9885fd7c6f..420a775e2a 100644--- a/src/video_core/renderer_vulkan/vk_present_manager.h+++ b/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 parametersvoid RecreateFrame(Frame* frame, u32 width, u32 height, bool is_srgb,