mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-05 18:40:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Vulkan: Set a flag to resize the swap chain when presenting fails

Browse Source 
Drivers can return VK_ERROR_OUT_OF_DATE_KHR from vkQueuePresentKHR, and
we should resize the image in this case, as well as when getting it back
from vkAcquireNextImageKHR.
This commit is contained in:
Stenzek 2017-09-16 15:53:08 +10:00
parent 80593f502e
commit cdf34a79f7
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
View File

@ -353,8 +353,13 @@ void CommandBufferManager::SubmitCommandBuffer(size_t index, VkSemaphore wait_se
nullptr}; nullptr};
res = vkQueuePresentKHR(g_vulkan_context->GetPresentQueue(), &present_info); res = vkQueuePresentKHR(g_vulkan_context->GetPresentQueue(), &present_info);
if (res != VK_SUCCESS && res != VK_ERROR_OUT_OF_DATE_KHR && res != VK_SUBOPTIMAL_KHR) if (res != VK_SUCCESS)
{
// VK_ERROR_OUT_OF_DATE_KHR is not fatal, just means we need to recreate our swap chain.
if (res != VK_ERROR_OUT_OF_DATE_KHR && res != VK_SUBOPTIMAL_KHR)
LOG_VULKAN_ERROR(res, "vkQueuePresentKHR failed: "); LOG_VULKAN_ERROR(res, "vkQueuePresentKHR failed: ");
m_present_failed_flag.Set();
}
} }
// Command buffer has been queued, so permit the next one. // Command buffer has been queued, so permit the next one.

4
Source/Core/VideoBackends/Vulkan/CommandBufferManager.h
View File

@ -16,6 +16,7 @@
#include <vector> #include <vector>
#include "Common/BlockingLoop.h" #include "Common/BlockingLoop.h"
#include "Common/Flag.h"
#include "Common/Semaphore.h" #include "Common/Semaphore.h"
#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoCommon.h"
@ -78,6 +79,8 @@ public:
void ExecuteCommandBuffer(bool submit_off_thread, bool wait_for_completion); void ExecuteCommandBuffer(bool submit_off_thread, bool wait_for_completion);
// Was the last present submitted to the queue a failure? If so, we must recreate our swapchain.
bool DidLastPresentFail() { return m_present_failed_flag.TestAndClear(); }
// Schedule a vulkan resource for destruction later on. This will occur when the command buffer // Schedule a vulkan resource for destruction later on. This will occur when the command buffer
// is next re-used, and the GPU has finished working with the specified resource. // is next re-used, and the GPU has finished working with the specified resource.
void DeferBufferDestruction(VkBuffer object); void DeferBufferDestruction(VkBuffer object);
@ -144,6 +147,7 @@ private:
}; };
std::deque<PendingCommandBufferSubmit> m_pending_submits; std::deque<PendingCommandBufferSubmit> m_pending_submits;
std::mutex m_pending_submit_lock; std::mutex m_pending_submit_lock;
Common::Flag m_present_failed_flag;
bool m_use_threaded_submission = false; bool m_use_threaded_submission = false;
}; };

12
Source/Core/VideoBackends/Vulkan/Renderer.cpp
View File

@ -718,8 +718,18 @@ void Renderer::DrawScreen(const TargetRectangle& scaled_efb_rect, u32 xfb_addr,
const XFBSourceBase* const* xfb_sources, u32 xfb_count, u32 fb_width, const XFBSourceBase* const* xfb_sources, u32 xfb_count, u32 fb_width,
u32 fb_stride, u32 fb_height) u32 fb_stride, u32 fb_height)
{ {
VkResult res;
if (!g_command_buffer_mgr->DidLastPresentFail())
{
// Grab the next image from the swap chain in preparation for drawing the window. // Grab the next image from the swap chain in preparation for drawing the window.
VkResult res = m_swap_chain->AcquireNextImage(m_image_available_semaphore); res = m_swap_chain->AcquireNextImage(m_image_available_semaphore);
}
else
{
// If the last present failed, we need to recreate the swap chain.
res = VK_ERROR_OUT_OF_DATE_KHR;
}
if (res == VK_SUBOPTIMAL_KHR || res == VK_ERROR_OUT_OF_DATE_KHR) if (res == VK_SUBOPTIMAL_KHR || res == VK_ERROR_OUT_OF_DATE_KHR)
{ {
// There's an issue here. We can't resize the swap chain while the GPU is still busy with it, // There's an issue here. We can't resize the swap chain while the GPU is still busy with it,