Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-20 15:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VulkanDevice: Add additional semaphore on swap chain

Browse source 
We don't actually need +1 semaphores, or, more than one really.
But, the validation layer gets cranky if we don't fence wait before the next image acquire.
So, add an additional semaphore to ensure that we're never acquiring before fence waiting.
This commit is contained in:
Stenzek 2024-03-08 14:16:52 +10:00
parent 7159330f63
commit de1338cbbc
No known key found for this signature in database
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util/vulkan_device.cpp
View file

@ -1272,7 +1272,7 @@ void VulkanDevice::SubmitCommandBuffer(VulkanSwapChain* present_swap_chain /* =
{ {
DoSubmitCommandBuffer(m_current_frame, present_swap_chain); DoSubmitCommandBuffer(m_current_frame, present_swap_chain);
if (present_swap_chain) if (present_swap_chain)
DoPresent(present_swap_chain, false); DoPresent(present_swap_chain);
return; return;
} }
@ -1317,7 +1317,7 @@ void VulkanDevice::DoSubmitCommandBuffer(u32 index, VulkanSwapChain* present_swa
} }
} }
void VulkanDevice::DoPresent(VulkanSwapChain* present_swap_chain, bool acquire_next) void VulkanDevice::DoPresent(VulkanSwapChain* present_swap_chain)
{ {
const VkPresentInfoKHR present_info = {VK_STRUCTURE_TYPE_PRESENT_INFO_KHR, const VkPresentInfoKHR present_info = {VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
nullptr, nullptr,
@ -1344,7 +1344,6 @@ void VulkanDevice::DoPresent(VulkanSwapChain* present_swap_chain, bool acquire_n
// Grab the next image as soon as possible, that way we spend less time blocked on the next // Grab the next image as soon as possible, that way we spend less time blocked on the next
// submission. Don't care if it fails, we'll deal with that at the presentation call site. // submission. Don't care if it fails, we'll deal with that at the presentation call site.
// Credit to dxvk for the idea. // Credit to dxvk for the idea.
if (acquire_next)
present_swap_chain->AcquireNextImage(); present_swap_chain->AcquireNextImage();
} }
@ -1379,7 +1378,7 @@ void VulkanDevice::PresentThread()
DoSubmitCommandBuffer(m_queued_present.command_buffer_index, m_queued_present.swap_chain); DoSubmitCommandBuffer(m_queued_present.command_buffer_index, m_queued_present.swap_chain);
if (m_queued_present.swap_chain) if (m_queued_present.swap_chain)
DoPresent(m_queued_present.swap_chain, true); DoPresent(m_queued_present.swap_chain);
m_present_done.store(true, std::memory_order_release); m_present_done.store(true, std::memory_order_release);
m_present_done_cv.notify_one(); m_present_done_cv.notify_one();
} }

2
src/util/vulkan_device.h
View file

@ -379,7 +379,7 @@ private:
void WaitForCommandBufferCompletion(u32 index); void WaitForCommandBufferCompletion(u32 index);
void DoSubmitCommandBuffer(u32 index, VulkanSwapChain* present_swap_chain); void DoSubmitCommandBuffer(u32 index, VulkanSwapChain* present_swap_chain);
void DoPresent(VulkanSwapChain* present_swap_chain, bool acquire_next); void DoPresent(VulkanSwapChain* present_swap_chain);
void WaitForPresentComplete(std::unique_lock<std::mutex>& lock); void WaitForPresentComplete(std::unique_lock<std::mutex>& lock);
void PresentThread(); void PresentThread();
void StartPresentThread(); void StartPresentThread();

10
src/util/vulkan_swap_chain.cpp
View file

@ -534,9 +534,13 @@ bool VulkanSwapChain::CreateSwapChain()
m_images.push_back(image); m_images.push_back(image);
} }
m_semaphores.reserve(image_count); // We don't actually need +1 semaphores, or, more than one really.
m_current_semaphore = (image_count - 1); // But, the validation layer gets cranky if we don't fence wait before the next image acquire.
for (u32 i = 0; i < image_count; i++) // So, add an additional semaphore to ensure that we're never acquiring before fence waiting.
const u32 semaphore_count = image_count + 1;
m_semaphores.reserve(semaphore_count);
m_current_semaphore = 0;
for (u32 i = 0; i < semaphore_count; i++)
{ {
ImageSemaphores sema; ImageSemaphores sema;