Skip to content

Commit 620c76a

Browse files
committed
Merge branch 'nsubtil/dlfg-crash' into 'main'
dlfg: Synchronize CS thread if we're about to switch presenters See merge request lightspeedrtx/dxvk-remix-nv!1676
2 parents 1782430 + 8b5865f commit 620c76a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/d3d9/d3d9_swapchain.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,14 +1341,15 @@ namespace dxvk {
13411341
// to ensure pacer thread is idle
13421342
m_dlfgPresenter->synchronize();
13431343
}
1344+
1345+
// flush all pending CS work
1346+
// this ensures any work that relies on the FG presenter is submitted before we
1347+
// synchronize the submission queue + GPU below
1348+
m_parent->SynchronizeCsThread();
13441349
// NV-DXVK end
13451350

13461351
m_device->waitForIdle();
13471352

1348-
// NV-DXVK start: DLFG integration
1349-
m_device->synchronizePresenter();
1350-
// NV-DXVK end
1351-
13521353
m_presenter = nullptr;
13531354
m_presentStatus.result = VK_SUCCESS;
13541355

0 commit comments

Comments
 (0)