[Scummvm-cvs-logs] SF.net SVN: scummvm:[54542] scummvm/trunk/backends/graphics/opengl

[fingolfin at users.sourceforge.net]

Revision: 54542
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54542&view=rev
Author:   fingolfin
Date:     2010-11-28 18:10:40 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
OPENGL: Modify source files to force recompilation

Modified Paths:
--------------
    scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
    scummvm/trunk/backends/graphics/opengl/gltexture.cpp
    scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp
    scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.cpp

Modified: scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp	2010-11-28 18:10:12 UTC (rev 54541)
+++ scummvm/trunk/backends/graphics/opengl/glerrorcheck.cpp	2010-11-28 18:10:40 UTC (rev 54542)
@@ -55,6 +55,7 @@
 	case GL_OUT_OF_MEMORY:		return "GL_OUT_OF_MEMORY";
 	}
 
+	// FIXME: Convert to use Common::String::format()
 	static char buf[40];
 	snprintf(buf, sizeof(buf), "(Unknown GL error code 0x%x)", error);
 	return buf;

Modified: scummvm/trunk/backends/graphics/opengl/gltexture.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.cpp	2010-11-28 18:10:12 UTC (rev 54541)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.cpp	2010-11-28 18:10:40 UTC (rev 54542)
@@ -35,6 +35,7 @@
 
 // Supported GL extensions
 static bool npot_supported = false;
+static bool glext_inited = false;
 
 /*static inline GLint xdiv(int numerator, int denominator) {
 	assert(numerator < (1 << 16));
@@ -54,10 +55,9 @@
 }
 
 void GLTexture::initGLExtensions() {
-	static bool inited = false;
 
 	// Return if extensions were already checked
-	if (inited)
+	if (glext_inited)
 		return;
 
 	// Get a string with all extensions
@@ -72,7 +72,7 @@
 			npot_supported = true;
 	}
 
-	inited = true;
+	glext_inited = true;
 }
 
 GLTexture::GLTexture(byte bpp, GLenum internalFormat, GLenum format, GLenum type)

Modified: scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp	2010-11-28 18:10:12 UTC (rev 54541)
+++ scummvm/trunk/backends/graphics/opengl/opengl-graphics.cpp	2010-11-28 18:10:40 UTC (rev 54542)
@@ -405,11 +405,9 @@
 }
 
 void OpenGLGraphicsManager::setFocusRectangle(const Common::Rect& rect) {
-
 }
 
 void OpenGLGraphicsManager::clearFocusRectangle() {
-
 }
 
 //

Modified: scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-11-28 18:10:12 UTC (rev 54541)
+++ scummvm/trunk/backends/graphics/openglsdl/openglsdl-graphics.cpp	2010-11-28 18:10:40 UTC (rev 54542)
@@ -65,10 +65,8 @@
 }
 
 OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
-
 }
 
-
 bool OpenGLSdlGraphicsManager::hasFeature(OSystem::Feature f) {
 	return
 		(f == OSystem::kFeatureFullscreenMode) ||


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