[Scummvm-cvs-logs] scummvm master -> da57eeeeb2548bd872b8b8fe7f3be040382b3b9b

eriktorbjorn eriktorbjorn at telia.com
Tue Feb 25 00:10:22 CET 2014


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:
da57eeeeb2 OPENGL: Fix building with --disable-16bit


Commit: da57eeeeb2548bd872b8b8fe7f3be040382b3b9b
    https://github.com/scummvm/scummvm/commit/da57eeeeb2548bd872b8b8fe7f3be040382b3b9b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-02-24T15:09:16-08:00

Commit Message:
OPENGL: Fix building with --disable-16bit

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 0a03412..cbd06e9 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -278,11 +278,15 @@ OSystem::TransactionError OpenGLGraphicsManager::endGFXTransaction() {
 		_gameScreen->allocate(_currentState.gameWidth, _currentState.gameHeight);
 		_gameScreen->enableLinearFiltering(_currentState.graphicsMode == GFX_LINEAR);
 		// We fill the screen to all black or index 0 for CLUT8.
+#ifdef USE_RGB_COLOR
 		if (_currentState.gameFormat.bytesPerPixel == 1) {
 			_gameScreen->fill(0);
 		} else {
 			_gameScreen->fill(_gameScreen->getSurface()->format.RGBToColor(0, 0, 0));
 		}
+#else
+		_gameScreen->fill(0);
+#endif
 	}
 
 	// Update our display area and cursor scaling. This makes sure we pick up






More information about the Scummvm-git-logs mailing list