Browse Source

Remove voodoo workaround from find_acceptable_display_mode.

gogg 15 years ago
parent
commit
dd2b42eaf1
1 changed files with 1 additions and 15 deletions
  1. 1 15
      panda/src/windisplay/winGraphicsWindow.cxx

+ 1 - 15
panda/src/windisplay/winGraphicsWindow.cxx

@@ -2304,21 +2304,7 @@ find_acceptable_display_mode(DWORD dwWidth, DWORD dwHeight, DWORD bpp,
     
     
     if ((dm.dmPelsWidth == dwWidth) && (dm.dmPelsHeight == dwHeight) &&
     if ((dm.dmPelsWidth == dwWidth) && (dm.dmPelsHeight == dwHeight) &&
         (dm.dmBitsPerPel == bpp)) {
         (dm.dmBitsPerPel == bpp)) {
-      // cout << "[FS FOUND] " << dwWidth << "x" << dwHeight << "@" << bpp << endl;
-      // We want to modify the current DEVMODE rather than using a fresh one in order
-      // to work around a Windows 7 bug.
-      ZeroMemory(&dm, sizeof(dm));
-      dm.dmSize = sizeof(dm);
-      if (0 != EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm)){
-        dm.dmPelsWidth = dwWidth;
-        dm.dmPelsHeight = dwHeight;
-        dm.dmBitsPerPel = bpp;
-        return true;
-      } else {
-        windisplay_cat.error() 
-          << "Couldn't retrieve active device mode.\n";
-        return false;
-      }
+      return true;
     }
     }
     modenum++;
     modenum++;
   }
   }