rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-04 16:24:29 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Always release frame latency semaphore in Present

Browse Source
This commit is contained in:
Philip Rebohle 2023-06-16 12:39:57 +02:00
parent 7dbe4abb48
commit 438c535fe7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/d3d11/d3d11_swapchain.cpp
View File

@ -276,19 +276,29 @@ namespace dxvk {
if (m_device->getDeviceStatus() != VK_SUCCESS) if (m_device->getDeviceStatus() != VK_SUCCESS)
hr = DXGI_ERROR_DEVICE_RESET; hr = DXGI_ERROR_DEVICE_RESET;
if ((PresentFlags & DXGI_PRESENT_TEST) || hr != S_OK) if (PresentFlags & DXGI_PRESENT_TEST)
return hr; return hr;
if (hr != S_OK) {
SyncFrameLatency();
return hr;
}
if (std::exchange(m_dirty, false)) if (std::exchange(m_dirty, false))
RecreateSwapChain(); RecreateSwapChain();
try { try {
PresentImage(SyncInterval); hr = PresentImage(SyncInterval);
} catch (const DxvkError& e) { } catch (const DxvkError& e) {
Logger::err(e.message()); Logger::err(e.message());
hr = E_FAIL; hr = E_FAIL;
} }
// Ensure to synchronize and release the frame latency semaphore
// even if presentation failed with STATUS_OCCLUDED, or otherwise
// applications using the semaphore may deadlock. This works because
// we do not increment the frame ID in those situations.
SyncFrameLatency();
return hr; return hr;
} }
@ -340,7 +350,7 @@ namespace dxvk {
SynchronizePresent(); SynchronizePresent();
if (!m_presenter->hasSwapChain()) if (!m_presenter->hasSwapChain())
return DXGI_STATUS_OCCLUDED; return i ? S_OK : DXGI_STATUS_OCCLUDED;
// Presentation semaphores and WSI swap chain image // Presentation semaphores and WSI swap chain image
PresenterInfo info = m_presenter->info(); PresenterInfo info = m_presenter->info();
@ -354,7 +364,7 @@ namespace dxvk {
RecreateSwapChain(); RecreateSwapChain();
if (!m_presenter->hasSwapChain()) if (!m_presenter->hasSwapChain())
return DXGI_STATUS_OCCLUDED; return i ? S_OK : DXGI_STATUS_OCCLUDED;
info = m_presenter->info(); info = m_presenter->info();
status = m_presenter->acquireNextImage(sync, imageIndex); status = m_presenter->acquireNextImage(sync, imageIndex);
@ -365,8 +375,6 @@ namespace dxvk {
m_dirtyHdrMetadata = false; m_dirtyHdrMetadata = false;
} }
// Resolve back buffer if it is multisampled. We
// only have to do it only for the first frame.
m_context->beginRecording( m_context->beginRecording(
m_device->createCommandList()); m_device->createCommandList());
@ -380,7 +388,6 @@ namespace dxvk {
SubmitPresent(immediateContext, sync, i); SubmitPresent(immediateContext, sync, i);
} }
SyncFrameLatency();
return S_OK; return S_OK;
} }