From 38051b159114a455a25d08dee94c55c55ff8f748 Mon Sep 17 00:00:00 2001
From: aignacio_sf <>
Date: Tue, 15 Apr 2008 19:23:21 +0000
Subject: [PATCH] Disable refresh rate checking.  Fix for SLI video cards.

---
 panda/src/dxgsg8/wdxGraphicsPipe8.cxx      | 22 +++++++++++++---------
 panda/src/dxgsg9/wdxGraphicsPipe9.cxx      | 22 +++++++++++++---------
 panda/src/windisplay/winGraphicsWindow.cxx |  3 +--
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx
index 1f5935d326..d868a88e86 100644
--- a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx
+++ b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx
@@ -622,17 +622,21 @@ search_for_valid_displaymode(DXScreenData &scrn,
       continue;
     }
 
-    if ((dispmode.RefreshRate<60) && (dispmode.RefreshRate>1)) {
-      // dont want refresh rates under 60Hz, but 0 or 1 might indicate
-      // a default refresh rate, which is usually > = 60
-      if (bVerboseMode) {
-        wdxdisplay8_cat.info()
-          << "skipping mode[" << i << "], bad refresh rate: "
-          << dispmode.RefreshRate << endl;
+    // disable refresh rate checking since SLI video cards may use 
+    // refresh rates less than 60
+    if (0) {
+      if ((dispmode.RefreshRate<60) && (dispmode.RefreshRate>1)) {
+        // dont want refresh rates under 60Hz, but 0 or 1 might indicate
+        // a default refresh rate, which is usually > = 60
+        if (bVerboseMode) {
+          wdxdisplay8_cat.info()
+            << "skipping mode[" << i << "], bad refresh rate: "
+            << dispmode.RefreshRate << endl;
+        }
+        continue;
       }
-      continue;
     }
-
+    
     // Note no attempt is made to verify if format will work at
     // requested size, so even if this call succeeds, could still get
     // an out-of-video-mem error
diff --git a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx
index bd9e834951..044d142859 100755
--- a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx
+++ b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx
@@ -648,17 +648,21 @@ search_for_valid_displaymode(DXScreenData &scrn,
         continue;
       }
 
-      if ((dispmode.RefreshRate<60) && (dispmode.RefreshRate>1)) {
-        // dont want refresh rates under 60Hz, but 0 or 1 might indicate
-        // a default refresh rate, which is usually > = 60
-        if (bVerboseMode) {
-          wdxdisplay9_cat.info()
-            << "skipping mode[" << i << "], bad refresh rate: "
-            << dispmode.RefreshRate << endl;
+      // disable refresh rate checking since SLI video cards may use 
+      // refresh rates less than 60
+      if (0) {
+        if ((dispmode.RefreshRate<60) && (dispmode.RefreshRate>1)) {
+          // dont want refresh rates under 60Hz, but 0 or 1 might indicate
+          // a default refresh rate, which is usually > = 60
+          if (bVerboseMode) {
+            wdxdisplay9_cat.info()
+              << "skipping mode[" << i << "], bad refresh rate: "
+              << dispmode.RefreshRate << endl;
+          }
+          continue;
         }
-        continue;
       }
-
+      
       // Note no attempt is made to verify if format will work at
       // requested size, so even if this call succeeds, could still get
       // an out-of-video-mem error
diff --git a/panda/src/windisplay/winGraphicsWindow.cxx b/panda/src/windisplay/winGraphicsWindow.cxx
index d835d030a1..b5c6d25b27 100644
--- a/panda/src/windisplay/winGraphicsWindow.cxx
+++ b/panda/src/windisplay/winGraphicsWindow.cxx
@@ -2043,8 +2043,7 @@ find_acceptable_display_mode(DWORD dwWidth, DWORD dwHeight, DWORD bpp,
     }
     
     if ((dm.dmPelsWidth == dwWidth) && (dm.dmPelsHeight == dwHeight) &&
-        (dm.dmBitsPerPel == bpp) && 
-        ACCEPTABLE_REFRESH_RATE(dm.dmDisplayFrequency)) {
+        (dm.dmBitsPerPel == bpp)) {
       return true;
     }
     modenum++;