[Scummvm-git-logs] scummvm master -> a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d

criezy criezy at scummvm.org
Mon Sep 5 22:41:33 CEST 2016


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

Summary:
65d3c15b01 OPENGL: Add missing USE_OSD defined checks around OSD code
a8cb3c8404 OPENGL: Implement getOSDFormat and copyRectToOSD


Commit: 65d3c15b014adfb833b7197bd2efd35f6a0b06d6
    https://github.com/scummvm/scummvm/commit/65d3c15b014adfb833b7197bd2efd35f6a0b06d6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T21:21:32+01:00

Commit Message:
OPENGL: Add missing USE_OSD defined checks around OSD code

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 c491b03..bea9c92 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -367,7 +367,10 @@ void OpenGLGraphicsManager::updateScreen() {
 	    && !_gameScreen->isDirty()
 	    && !(_overlayVisible && _overlay->isDirty())
 	    && !(_cursorVisible && _cursor && _cursor->isDirty())
-	    && _osdAlpha == 0) {
+#ifdef USE_OSD
+	    && _osdAlpha == 0
+#endif
+	    ) {
 		return;
 	}
 	_forceRedraw = false;
@@ -378,7 +381,9 @@ void OpenGLGraphicsManager::updateScreen() {
 		_cursor->updateGLTexture();
 	}
 	_overlay->updateGLTexture();
+#ifdef USE_OSD
 	_osd->updateGLTexture();
+#endif
 
 	// Clear the screen buffer.
 	if (_scissorOverride && !_overlayVisible) {


Commit: a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d
    https://github.com/scummvm/scummvm/commit/a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-05T21:40:45+01:00

Commit Message:
OPENGL: Implement getOSDFormat and copyRectToOSD

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 bea9c92..8861d36 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -758,7 +758,7 @@ void OpenGLGraphicsManager::displayMessageOnOSD(const char *msg) {
 
 void OpenGLGraphicsManager::copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h) {
 #ifdef USE_OSD
-	warning("implement copyRectToOSD"); //TODO
+	_osd->copyRectToTexture(x, y, w, h, buf, pitch);
 #endif
 }
 
@@ -779,7 +779,9 @@ void OpenGLGraphicsManager::clearOSD() {
 #endif
 }
 
-Graphics::PixelFormat OpenGLGraphicsManager::getOSDFormat() { return Graphics::PixelFormat(); } //TODO
+Graphics::PixelFormat OpenGLGraphicsManager::getOSDFormat() {
+	return _defaultFormatAlpha;
+}
 
 void OpenGLGraphicsManager::setPalette(const byte *colors, uint start, uint num) {
 	assert(_gameScreen->hasPalette());





More information about the Scummvm-git-logs mailing list