rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Fix synchronization on swapchain tear-down

Browse Source
This commit is contained in:
Philip Rebohle 2025-03-05 21:46:07 +01:00
parent d04fe1cdc0
commit b49e1bce10
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dxvk/dxvk_presenter.cpp
View File

@ -200,10 +200,15 @@ namespace dxvk {
VkResult status = m_vkd->vkQueuePresentKHR( VkResult status = m_vkd->vkQueuePresentKHR(
m_device->queues().graphics.queueHandle, &info); m_device->queues().graphics.queueHandle, &info);
// Maintain valid state if presentation succeeded, even // Maintain valid state if presentation succeeded, even if we want to
// if we want to recreate the swapchain. // recreate the swapchain. Spec says that 'queue' operations, i.e. the
if (m_device->features().extSwapchainMaintenance1.swapchainMaintenance1) // semaphore and fence signals, still happen if present fails with
currSync.fenceSignaled = status >= 0; // normal swapchain errors, such as OUT_OF_DATE or SURFACE_LOST.
if (m_device->features().extSwapchainMaintenance1.swapchainMaintenance1) {
currSync.fenceSignaled = status != VK_ERROR_OUT_OF_DEVICE_MEMORY
&& status != VK_ERROR_OUT_OF_HOST_MEMORY
&& status != VK_ERROR_DEVICE_LOST;
}
if (status >= 0) { if (status >= 0) {
m_acquireStatus = VK_NOT_READY; m_acquireStatus = VK_NOT_READY;
@ -1140,6 +1145,12 @@ namespace dxvk {
void Presenter::destroySwapchain() { void Presenter::destroySwapchain() {
// Without present fence support, waiting for the queue or device to go idle
// is the only way to properly synchronize swapchain teardown. Care must be
// taken not to call this method while the submission queue is locked.
if (!m_device->features().extSwapchainMaintenance1.swapchainMaintenance1)
m_device->waitForIdle();
// Wait for the presentWait worker to finish using // Wait for the presentWait worker to finish using
// the swapchain before destroying it. // the swapchain before destroying it.
std::unique_lock lock(m_frameMutex); std::unique_lock lock(m_frameMutex);