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

SDL: Simplify initial graphics manager selection for OpenGL.

Browse source
This commit is contained in:
Johannes Schickel 2013-10-21 00:34:06 +02:00
parent 4080a7a3f6
commit 17cb26b93c
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backends/platform/sdl/sdl.cpp
View file

@ -172,26 +172,18 @@ void OSystem_SDL::initBackend() {
if (_graphicsManager == 0) { if (_graphicsManager == 0) {
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (ConfMan.hasKey("gfx_mode")) { if (ConfMan.hasKey("gfx_mode")) {
Common::String gfxMode(ConfMan.get("gfx_mode"));
bool use_opengl = false;
const OSystem::GraphicsMode *mode = OpenGLSdlGraphicsManager::supportedGraphicsModes();
int i = 0;
while (mode->name) {
if (scumm_stricmp(mode->name, gfxMode.c_str()) == 0) {
_graphicsMode = i + _firstGLMode;
use_opengl = true;
}
mode++;
++i;
}
// If the gfx_mode is from OpenGL, create the OpenGL graphics manager // If the gfx_mode is from OpenGL, create the OpenGL graphics manager
if (use_opengl) { Common::String gfxMode(ConfMan.get("gfx_mode"));
for (uint i = _firstGLMode; i < _graphicsModeIds.size(); ++i) {
if (!scumm_stricmp(_graphicsModes[i].name, gfxMode.c_str())) {
_graphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource); _graphicsManager = new OpenGLSdlGraphicsManager(_desktopWidth, _desktopHeight, _eventSource);
_graphicsMode = i;
break;
}
} }
} }
#endif #endif
if (_graphicsManager == 0) { if (_graphicsManager == 0) {
_graphicsManager = new SurfaceSdlGraphicsManager(_eventSource); _graphicsManager = new SurfaceSdlGraphicsManager(_eventSource);
} }