[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl_gl.cpp,1.62,1.63

Travis Howell kirben at users.sourceforge.net
Sat Oct 4 17:47:17 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv3955/backends/sdl

Modified Files:
	sdl_gl.cpp 
Log Message:

Remove unneeded case.
Disable code that causes crash when using opengl from command line for now.


Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- sdl_gl.cpp	5 Oct 2003 00:40:25 -0000	1.62
+++ sdl_gl.cpp	5 Oct 2003 00:46:46 -0000	1.63
@@ -100,12 +100,6 @@
 	_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 @@
 		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 @@
 			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, 





More information about the Scummvm-git-logs mailing list