[Scummvm-cvs-logs] scummvm master -> 020a413247b7963242f0058c8618a9140f432f3f

lordhoto lordhoto at gmail.com
Thu Feb 24 18:40:13 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
020a413247 OPENGL: Set _gameTexture to 0 after deleting it.


Commit: 020a413247b7963242f0058c8618a9140f432f3f
    https://github.com/scummvm/scummvm/commit/020a413247b7963242f0058c8618a9140f432f3f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-24T09:36:57-08:00

Commit Message:
OPENGL: Set _gameTexture to 0 after deleting it.

This fixes a segfault when trying to use the OpenGL backend with 16bpp games,
however this does not make Last Express nor Loom PC-Engine Japanese work for
me. They now fail with a "Pixel format not supported" error.

Changed paths:
    backends/graphics/opengl/opengl-graphics.cpp



diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index d1804e7..8bca09b 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1059,8 +1059,10 @@ void OpenGLGraphicsManager::initGL() {
 
 void OpenGLGraphicsManager::loadTextures() {
 #ifdef USE_RGB_COLOR
-	if (_transactionDetails.formatChanged && _gameTexture)
+	if (_transactionDetails.formatChanged && _gameTexture) {
 		delete _gameTexture;
+		_gameTexture = 0;
+	}
 #endif
 
 	uint gameScreenBPP = 0;






More information about the Scummvm-git-logs mailing list