[dxgi] Prevent recursive fullscreen mode change.

doitsujin · Sep 6, 2024 · b80d69b · b80d69b
1 parent daccde7
commit b80d69b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/dxgi/dxgi_swapchain.cpp b/src/dxgi/dxgi_swapchain.cpp
@@ -670,6 +670,12 @@ namespace dxvk {
       }
     }
 
+    if (m_ModeChangeInProgress) {
+      Logger::warn("Nested EnterFullscreenMode");
+      return DXGI_STATUS_MODE_CHANGE_IN_PROGRESS;
+    }
+    scoped_bool in_progress(m_ModeChangeInProgress);
+
     DXGI_MODE_DESC1 displayMode = { };
     displayMode.Width            = m_desc.Width;
     displayMode.Height           = m_desc.Height;
@@ -731,7 +737,13 @@ namespace dxvk {
       SetGammaControl(0, nullptr);
       ReleaseMonitorData();
     }
-
+
+    if (m_ModeChangeInProgress) {
+      Logger::warn("Nested LeaveFullscreenMode");
+      return DXGI_STATUS_MODE_CHANGE_IN_PROGRESS;
+    }
+    scoped_bool in_progress(m_ModeChangeInProgress);
+
     // Restore internal state
     m_descFs.Windowed = TRUE;
     m_target  = nullptr;

diff --git a/src/dxgi/dxgi_swapchain.h b/src/dxgi/dxgi_swapchain.h
@@ -184,6 +184,7 @@ namespace dxvk {
     DXGI_SWAP_CHAIN_DESC1           m_desc;
     DXGI_SWAP_CHAIN_FULLSCREEN_DESC m_descFs;
     UINT                            m_presentId;
+    bool                            m_ModeChangeInProgress = false;
 
     Com<IDXGIVkSwapChain>           m_presenter;
     Com<IDXGIVkSwapChain1>          m_presenter1;

diff --git a/src/util/util_misc.h b/src/util/util_misc.h
@@ -43,4 +43,14 @@ namespace dxvk {
     return duration.count() / refreshPeriod.count();
   }
 
-}
+  struct scoped_bool {
+    scoped_bool(bool &v) : m_val(v) {
+      m_val = true;
+    }
+    ~scoped_bool() {
+      m_val = false;
+    }
+
+    bool& m_val;
+  };
+}