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

[jvprat at users.sourceforge.net]

Revision: 55166
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55166&view=rev
Author:   jvprat
Date:     2011-01-08 16:05:27 +0000 (Sat, 08 Jan 2011)

Log Message:
-----------
OPENGL: Skip empty texture updates.

This fixes some hangs when calling the GMM while running Fascination.

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

Modified: scummvm/trunk/backends/graphics/opengl/gltexture.cpp
===================================================================
--- scummvm/trunk/backends/graphics/opengl/gltexture.cpp	2011-01-08 12:44:11 UTC (rev 55165)
+++ scummvm/trunk/backends/graphics/opengl/gltexture.cpp	2011-01-08 16:05:27 UTC (rev 55166)
@@ -141,6 +141,10 @@
 }
 
 void GLTexture::updateBuffer(const void *buf, int pitch, GLuint x, GLuint y, GLuint w, GLuint h) {
+	// Skip empty updates.
+	if (w * h == 0)
+		return;
+
 	// Select this OpenGL texture
 	glBindTexture(GL_TEXTURE_2D, _textureName); CHECK_GL_ERROR();
 


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