[Scummvm-cvs-logs] SF.net SVN: scummvm:[51292] scummvm/branches/gsoc2010-opengl/backends/ graphics/opengl

[vgvgf at users.sourceforge.net]

Revision: 51292
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51292&view=rev
Author:   vgvgf
Date:     2010-07-26 04:40:00 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
OPENGL: Do not allow changing to a not supported scale while on fullscreen.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
    scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-07-26 04:17:37 UTC (rev 51291)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/opengl/opengl-graphics.cpp	2010-07-26 04:40:00 UTC (rev 51292)
@@ -931,8 +931,16 @@
 	if (newScale == _videoMode.scaleFactor)
 		return;
 
+	switch (newScale) {
+	case OpenGL::GFX_NORMAL:
+		_videoMode.mode = OpenGL::GFX_NORMAL;
+	case OpenGL::GFX_DOUBLESIZE:
+		_videoMode.mode = OpenGL::GFX_DOUBLESIZE;
+	case OpenGL::GFX_TRIPLESIZE:
+		_videoMode.mode = OpenGL::GFX_TRIPLESIZE;
+	}
+
 	_videoMode.scaleFactor = newScale;
-
 	_transactionDetails.sizeChanged = true;
 }
 

Modified: scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-07-26 04:17:37 UTC (rev 51291)
+++ scummvm/branches/gsoc2010-opengl/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-07-26 04:40:00 UTC (rev 51292)
@@ -183,6 +183,8 @@
 			_videoMode.hardwareWidth = bestMode->w;
 			_videoMode.hardwareHeight = bestMode->h;
 		} else {
+			if (_oldVideoMode.fullscreen)
+				return false;
 			_videoMode.fullscreen = false;
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.