thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OPENGL: Remove unnecessary best fullscreen mode detection code.

Browse source 
svn-id: r52056
This commit is contained in:
Alejandro Marzini 2010-08-13 05:16:42 +00:00
parent d84428e678
commit 610f041930
2 changed files with 4 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -36,8 +36,7 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
_lastFullscreenModeWidth(0),
_lastFullscreenModeHeight(0),
_desktopWidth(0),
_desktopHeight(0),
_desktopAspectRatio(0) {
_desktopHeight(0) {
// Initialize SDL video subsystem
if (SDL_InitSubSystem(SDL_INIT_VIDEO) == -1) {
@ -52,7 +51,6 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
if (videoInfo->current_w > 0 && videoInfo->current_h > 0) {
_desktopWidth = videoInfo->current_w;
_desktopHeight = videoInfo->current_h;
_desktopAspectRatio = videoInfo->current_w * 10000 / videoInfo->current_h;
}
if (ConfMan.hasKey("last_fullscreen_mode_width") && ConfMan.hasKey("last_fullscreen_mode_height")) {
@ -233,12 +231,9 @@ bool OpenGLSdlGraphicsManager::setupFullscreenMode() {
SDL_Rect const* const*availableModes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_OPENGL);
// If -1, autodetect the fullscreen mode
// The first one to select will be the last used fullscreen mode
// The second one the desktop resolution.
// In the rare case that there is no fullscreen mode with same desktop resolution,
// or when the desktop data could not be obtained, the smallest one with the same
// aspect ratio as desktop will be selected.
// Finaly, if all other fail, the one with smallest metric will be selected.
// The last used fullscreen mode will be prioritized, if there is no last fullscreen
// mode, the desktop resolution will be used, and in case the desktop resolution
// is not available as a fullscreen mode, the one with smallest metric will be selected.
if (_videoMode.activeFullscreenMode == -1) {
// Desktop resolution
int desktopModeIndex = -1;
@ -248,11 +243,6 @@ bool OpenGLSdlGraphicsManager::setupFullscreenMode() {
int bestModeIndex = 0;
uint bestMetric = (uint)-1;
// Best Aspect Ratio mode (Same ASR as desktop and less metric)
const SDL_Rect *bestASRMode = NULL;
int bestASRModeIndex = 0;
uint bestASRMetric = (uint)-1;
// Iterate over all available fullscreen modes
for (int i = 0; const SDL_Rect *mode = availableModes[i]; i++) {
// Try to setup the last used fullscreen mode
@ -277,11 +267,6 @@ bool OpenGLSdlGraphicsManager::setupFullscreenMode() {
bestMetric = metric;
bestModeIndex = i;
}
if ((uint)(mode->w * 10000 / mode->h) == _desktopAspectRatio) {
bestASRMode = mode;
bestASRModeIndex = i;
bestASRMetric = metric;
}
}
if (desktopModeIndex >= 0) {
@ -290,12 +275,6 @@ bool OpenGLSdlGraphicsManager::setupFullscreenMode() {
_videoMode.activeFullscreenMode = desktopModeIndex;
return true;
} else if (bestASRMode) {
_videoMode.hardwareWidth = bestASRMode->w;
_videoMode.hardwareHeight = bestASRMode->h;
_videoMode.activeFullscreenMode = bestASRModeIndex;
return true;
} else if (bestMode) {
_videoMode.hardwareWidth = bestMode->w;
_videoMode.hardwareHeight = bestMode->h;