From dd2b42eaf12d3a99f3c7f8550eae2023fbc5b9ff Mon Sep 17 00:00:00 2001 From: gogg Date: Sun, 14 Mar 2010 22:27:48 +0000 Subject: [PATCH] Remove voodoo workaround from find_acceptable_display_mode. --- panda/src/windisplay/winGraphicsWindow.cxx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/panda/src/windisplay/winGraphicsWindow.cxx b/panda/src/windisplay/winGraphicsWindow.cxx index 1d0e334ac2..ddc4491408 100644 --- a/panda/src/windisplay/winGraphicsWindow.cxx +++ b/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) && (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++; }