Merge branch 'nfreybler/BUGFIX__cherry_pick_swapchain_present_fix' in…

…to 'main' cherry pick swapchain present fix See merge request lightspeedrtx/dxvk-remix-nv!1162
NVIDIAGameWorks · Nov 15, 2024 · 6528a0b · 6528a0b
2 parents edf9ae6 + 0f7c200
commit 6528a0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/d3d11/d3d11_swapchain.cpp b/src/d3d11/d3d11_swapchain.cpp
@@ -281,14 +281,17 @@ namespace dxvk {
 
       VkResult status = m_presenter->acquireNextImage(sync, imageIndex);
 
-      while (status != VK_SUCCESS && status != VK_SUBOPTIMAL_KHR) {
+      while (status != VK_SUCCESS) {
         RecreateSwapChain(m_vsync);
 
         if (!m_presenter->hasSwapChain())
           return DXGI_STATUS_OCCLUDED;
 
         info = m_presenter->info();
         status = m_presenter->acquireNextImage(sync, imageIndex);
+
+        if (status == VK_SUBOPTIMAL_KHR)
+          break;
       }
 
       // Resolve back buffer if it is multisampled. We

diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp
@@ -1155,14 +1155,17 @@ namespace dxvk {
       // NV-DXVK start: DLFG integration
       VkResult status = presenter->acquireNextImage(sync, imageIndex);
       // NV-DXVK end
-      
-      while (status != VK_SUCCESS && status != VK_SUBOPTIMAL_KHR) {
+
+      while (status != VK_SUCCESS) {
         RecreateSwapChain(m_vsync);
 
         // NV-DXVK start: DLFG integration
         info = presenter->info();
         status = presenter->acquireNextImage(sync, imageIndex);
         // NV-DXVK end
+
+        if (status == VK_SUBOPTIMAL_KHR)
+          break;
       }
 
       m_context->beginRecording(