lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround AcquireNextImage being awful

Browse Source 
* Apparently the spec allows drivers to do extremely stupid things with
  swapchain images and return them even when it's not valid for you to use them
  yet because last frame's work to the image is still ongoing, which leads to a
  validation warning about using a semaphore when it might technically still be
  in flight.
* To get around this because AcquireNextImage doesn't actually block until an
  image is ready inspite of having a timeout and being expected to return a
  usable image it doesn't, we use a manual fence to do what AcquireNextImage
  should be doing.
This commit is contained in:
baldurk
2024-11-20 13:02:19 +00:00
parent 2daffaee4a
commit 030f3430ee
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/vk/vk_test.cpp
+18 -1
View File
@@ -1033,6 +1033,12 @@ void VulkanGraphicsTest::setName(VkSemaphore obj, const std::string &name)
setName(VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)obj, name);
}
template <>
void VulkanGraphicsTest::setName(VkFence obj, const std::string &name)
{
setName(VK_OBJECT_TYPE_FENCE, (uint64_t)obj, name);
}
void VulkanGraphicsTest::setName(VkObjectType objType, uint64_t obj, const std::string &name)
{
if(vkSetDebugUtilsObjectNameEXT)
@@ -1409,6 +1415,12 @@ VulkanWindow::VulkanWindow(VulkanGraphicsTest *test, GraphicsWindow *win)
test->setName(renderStartSemaphore[i], title + " renderStartSemaphore" + std::to_string(i));
test->setName(renderEndSemaphore[i], title + " renderEndSemaphore" + std::to_string(i));
// create signalled so the first wait works
CHECK_VKR(vkCreateFence(m_Test->device, vkh::FenceCreateInfo(VK_FENCE_CREATE_SIGNALED_BIT),
NULL, &imageFences[i]));
test->setName(imageFences[i], title + " fence" + std::to_string(i));
}
#if defined(WIN32)
@@ -1467,6 +1479,7 @@ VulkanWindow::~VulkanWindow()
{
vkDestroySemaphore(m_Test->device, renderStartSemaphore[i], NULL);
vkDestroySemaphore(m_Test->device, renderEndSemaphore[i], NULL);
vkDestroyFence(m_Test->device, imageFences[i], NULL);
}
if(surface)
@@ -1597,8 +1610,12 @@ void VulkanWindow::Acquire()
semIdx = (semIdx + 1) % ARRAY_COUNT(renderStartSemaphore);
// acquire next image stupidly does not properly block, do a manual block
vkWaitForFences(m_Test->device, 1, &imageFences[semIdx], VK_FALSE, UINT64_MAX);
vkResetFences(m_Test->device, 1, &imageFences[semIdx]);
VkResult vkr = vkAcquireNextImageKHR(m_Test->device, swap, UINT64_MAX,
renderStartSemaphore[semIdx], VK_NULL_HANDLE, &imgIndex);
renderStartSemaphore[semIdx], imageFences[semIdx], &imgIndex);
if(vkr == VK_SUBOPTIMAL_KHR || vkr == VK_ERROR_OUT_OF_DATE_KHR)
{
util/test/demos/vk/vk_test.h
+1
View File
@@ -184,6 +184,7 @@ private:
uint32_t semIdx = 0;
VkSemaphore renderStartSemaphore[4] = {};
VkSemaphore renderEndSemaphore[4] = {};
VkFence imageFences[4] = {};
std::vector<VkFramebuffer> fbs;
GraphicsWindow *m_Win;