Not call CDS_SetMode if the resolution matches the Display (Win). fix #…

…35
tx00100xt · Oct 30, 2023 · 9f66ce0 · 9f66ce0
1 parent f774817
commit 9f66ce0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/SamTFE/Sources/Engine/Graphics/GfxLibrary.cpp b/SamTFE/Sources/Engine/Graphics/GfxLibrary.cpp
@@ -1532,15 +1532,21 @@ BOOL CGfxLibrary::StartDisplayMode( enum GfxAPIType eAPI, INDEX iAdapter, PIX pi
 #ifdef SE1_VULKAN
   else if (eAPI == GAT_VK)
   {
-    // disable multimonitor support if it can interfere with Vulkan
-    MonitorsOff();
-    if( bFullScreen) {
-      // set windows mode to fit same size
-      bSuccess = CDS_SetMode( pixSizeI, pixSizeJ, eColorDepth);
-      if( !bSuccess) return FALSE;
+    PIX pixCurrentSizeI = ::GetSystemMetrics(SM_CXSCREEN);
+    PIX pixCurrentSizeJ = ::GetSystemMetrics(SM_CYSCREEN);
+    if ( (pixCurrentSizeI == pixSizeI) && (pixCurrentSizeJ == pixSizeJ) ) {
+      // Nothing, because the resolution does not need to be changed
     } else {
-      // reset windows mode
-      CDS_ResetMode();
+      // disable multimonitor support if it can interfere with Vulkan
+      MonitorsOff();
+      if( bFullScreen) {
+        // set windows mode to fit same size
+        bSuccess = CDS_SetMode( pixSizeI, pixSizeJ, eColorDepth);
+        if( !bSuccess) return FALSE;
+      } else {
+        // reset windows mode
+        CDS_ResetMode();
+      }
     }
     // startup Vulkan
 

diff --git a/SamTSE/Sources/Engine/Graphics/GfxLibrary.cpp b/SamTSE/Sources/Engine/Graphics/GfxLibrary.cpp
@@ -1532,15 +1532,21 @@ BOOL CGfxLibrary::StartDisplayMode( enum GfxAPIType eAPI, INDEX iAdapter, PIX pi
 #ifdef SE1_VULKAN
   else if (eAPI == GAT_VK)
   {
-    // disable multimonitor support if it can interfere with Vulkan
-    MonitorsOff();
-    if( bFullScreen) {
-      // set windows mode to fit same size
-      bSuccess = CDS_SetMode( pixSizeI, pixSizeJ, eColorDepth);
-      if( !bSuccess) return FALSE;
+    PIX pixCurrentSizeI = ::GetSystemMetrics(SM_CXSCREEN);
+    PIX pixCurrentSizeJ = ::GetSystemMetrics(SM_CYSCREEN);
+    if ( (pixCurrentSizeI == pixSizeI) && (pixCurrentSizeJ == pixSizeJ) ) {
+      // Nothing, because the resolution does not need to be changed
     } else {
-      // reset windows mode
-      CDS_ResetMode();
+      // disable multimonitor support if it can interfere with Vulkan
+      MonitorsOff();
+      if( bFullScreen) {
+        // set windows mode to fit same size
+        bSuccess = CDS_SetMode( pixSizeI, pixSizeJ, eColorDepth);
+        if( !bSuccess) return FALSE;
+      } else {
+        // reset windows mode
+        CDS_ResetMode();
+      }
     }
     // startup Vulkan