diff options
| author | Travis Howell | 2003-10-05 00:46:46 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-10-05 00:46:46 +0000 |
| commit | 03200d83277def6cfe77e0e49825cdc2bbd4ff74 (patch) | |
| tree | 7c8486cba89a0c14132d4b09aded68b452216cbb /backends/sdl | |
| parent | 48fd7e39d55e69fd0af624d80ea64d7e5e13eb1a (diff) | |
| download | scummvm-rg350-03200d83277def6cfe77e0e49825cdc2bbd4ff74.tar.gz scummvm-rg350-03200d83277def6cfe77e0e49825cdc2bbd4ff74.tar.bz2 scummvm-rg350-03200d83277def6cfe77e0e49825cdc2bbd4ff74.zip | |
Remove unneeded case.
Disable code that causes crash when using opengl from command line for now.
svn-id: r10597
Diffstat (limited to 'backends/sdl')
| -rw-r--r-- | backends/sdl/sdl_gl.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp index bd05d831b1..5366b77550 100644 --- a/backends/sdl/sdl_gl.cpp +++ b/backends/sdl/sdl_gl.cpp @@ -100,12 +100,6 @@ void OSystem_SDL_OpenGL::load_gfx_mode() { _tmpScreenWidth = (_screenWidth + 3); switch(_mode) { - case GFX_BILINEAR: - _usingOpenGL = true; - _mode = GFX_NORMAL; - // FIXME: shouldn't _scaleFactor be set here? - break; - case GFX_NORMAL: _scaleFactor = 1; _scaler_proc = Normal1x; @@ -236,6 +230,8 @@ void OSystem_SDL_OpenGL::load_gfx_mode() { tmpBlackRect.h = 256-_screenHeight-_glScreenStart; if (!_adjustAspectRatio) { + // Disable code for now, since it causes crash if OpenGL is used from command line +/* // Don't use the whole screen (black borders) fb2gl.init(0, 0, 0, 15, _glFlags); _glScreenStart = _glBorderHeight; @@ -261,12 +257,12 @@ void OSystem_SDL_OpenGL::load_gfx_mode() { SDL_FillRect(tmpSurface, &tmpBlackRect, 0); fb2gl.blit16(tmpSurface, 1, &tmpBlackRect, 0, _glBottomOfGameScreen); +*/ } else { // Use the whole screen fb2gl.init(0, 0, 0, 72, _glFlags); _glScreenStart = 0; } - } else { // SDL backend _tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen, _tmpScreenWidth, |