griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Vulkan: Advance to next swapchain semaphore

Browse Source 
The render frame wasn't increased -> always the same semaphore was
selected. In case rendering is fast (or swapchain needs to be
recreated) it could select a semaphore that still had some pending
operations.
This commit is contained in:
Jeroen Bakker
2025-03-24 12:46:04 +01:00
parent 03a34204ff
commit 7e68042137
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/ghost/intern/GHOST_ContextVK.cc
View File

@@ -559,13 +559,13 @@ GHOST_TSuccess GHOST_ContextVK::swapBuffers()
* swapchain image. Other do it when calling vkQueuePresent. */
VkResult result = VK_ERROR_OUT_OF_DATE_KHR;
uint32_t image_index = 0;
int32_t render_frame = 0;
m_render_frame += 1;
int32_t semaphore_index = uint32_t(m_render_frame % m_acquire_semaphores.size());
while (result == VK_ERROR_OUT_OF_DATE_KHR) {
render_frame = (m_render_frame + 1) % m_acquire_semaphores.size();
result = vkAcquireNextImageKHR(device,
m_swapchain,
UINT64_MAX,
m_acquire_semaphores[render_frame],
m_acquire_semaphores[semaphore_index],
VK_NULL_HANDLE,
&image_index);
if (result == VK_ERROR_OUT_OF_DATE_KHR) {
@@ -578,8 +578,8 @@ GHOST_TSuccess GHOST_ContextVK::swapBuffers()
swap_chain_data.image = m_swapchain_images[image_index];
swap_chain_data.surface_format = m_surface_format;
swap_chain_data.extent = m_render_extent;
swap_chain_data.acquire_semaphore = m_acquire_semaphores[render_frame];
swap_chain_data.present_semaphore = m_present_semaphores[render_frame];
swap_chain_data.acquire_semaphore = m_acquire_semaphores[semaphore_index];
swap_chain_data.present_semaphore = m_present_semaphores[semaphore_index];
if (swap_buffers_pre_callback_) {
swap_buffers_pre_callback_(&swap_chain_data);
@@ -588,7 +588,7 @@ GHOST_TSuccess GHOST_ContextVK::swapBuffers()
VkPresentInfoKHR present_info = {};
present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
present_info.waitSemaphoreCount = 1;
present_info.pWaitSemaphores = &m_present_semaphores[render_frame];
present_info.pWaitSemaphores = &m_present_semaphores[semaphore_index];
present_info.swapchainCount = 1;
present_info.pSwapchains = &m_swapchain;
present_info.pImageIndices = &image_index;

2
intern/ghost/intern/GHOST_ContextVK.hh
View File

@@ -182,7 +182,7 @@ class GHOST_ContextVK : public GHOST_Context {
std::vector<VkImage> m_swapchain_images;
std::vector<VkSemaphore> m_acquire_semaphores;
std::vector<VkSemaphore> m_present_semaphores;
uint32_t m_render_frame;
uint64_t m_render_frame;
VkExtent2D m_render_extent;
VkExtent2D m_render_extent_min;