From 2094bd31ec92db57c3da48bfad27252ad5a55ed2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 17 Nov 2013 20:28:16 +0100
Subject: OPENGL: Fix >1Bpp mouse cursors which do not require format
 conversion.

---
 backends/graphics/opengl/opengl-graphics.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'backends/graphics')

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 9ad0e62f37..a97f680f15 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.
-- 
cgit v1.2.3