[Scummvm-cvs-logs] scummvm master -> 2094bd31ec92db57c3da48bfad27252ad5a55ed2
lordhoto
lordhoto at gmail.com
Sun Nov 17 20:29:52 CET 2013
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:
2094bd31ec OPENGL: Fix >1Bpp mouse cursors which do not require format conversion.
Commit: 2094bd31ec92db57c3da48bfad27252ad5a55ed2
https://github.com/scummvm/scummvm/commit/2094bd31ec92db57c3da48bfad27252ad5a55ed2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-17T11:28:16-08:00
Commit Message:
OPENGL: Fix >1Bpp mouse cursors which do not require format conversion.
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 9ad0e62..a97f680 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -608,13 +608,10 @@ void OpenGLGraphicsManager::setMouseCursor(const void *buf, uint w, uint h, int
Graphics::Surface *dst = _cursor->getSurface();
const uint srcPitch = w * inputFormat.bytesPerPixel;
- // In case the actual cursor format differs from the requested format
- // we will need to convert the format. This might be the case because
- // the cursor format does not have any alpha bits.
- if (dst->format != inputFormat) {
- Graphics::crossBlit((byte *)dst->getPixels(), (const byte *)buf, dst->pitch, srcPitch,
- w, h, dst->format, inputFormat);
- }
+ // Copy the cursor data to the actual texture surface. This will make
+ // sure that the data is also converted to the expected format.
+ Graphics::crossBlit((byte *)dst->getPixels(), (const byte *)buf, dst->pitch, srcPitch,
+ w, h, dst->format, inputFormat);
// We apply the color key by setting the alpha bits of the pixels to
// fully transparent.
More information about the Scummvm-git-logs
mailing list