aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics
diff options
context:
space:
mode:
authorThierry Crozat2016-09-05 21:21:12 +0100
committerThierry Crozat2016-09-05 21:40:45 +0100
commita8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d (patch)
treeebb0e941af4739d6e1f15e1c15f182e80c375a16 /backends/graphics
parent65d3c15b014adfb833b7197bd2efd35f6a0b06d6 (diff)
downloadscummvm-rg350-a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d.tar.gz
scummvm-rg350-a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d.tar.bz2
scummvm-rg350-a8cb3c8404f1f293607dc22ad0a23ec5e8f02b3d.zip
OPENGL: Implement getOSDFormat and copyRectToOSD
Diffstat (limited to 'backends/graphics')
-rw-r--r--backends/graphics/opengl/opengl-graphics.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index bea9c927e5..8861d364e6 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());