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

athrxx athrxx at scummvm.org
Sat Jun 18 13:20:12 CEST 2011


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:
cc77de35c2 SCUMM: make sure asmDrawStripToScreen is not called in 16bit mode


Commit: cc77de35c23c5cf3caee33b04a93c88fa4e02b29
    https://github.com/scummvm/scummvm/commit/cc77de35c23c5cf3caee33b04a93c88fa4e02b29
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-18T04:12:13-07:00

Commit Message:
SCUMM: make sure asmDrawStripToScreen is not called in 16bit mode

(fixes possible issue in LOOM PCE)

Changed paths:
    engines/scumm/gfx.cpp



diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index d3ff826..b78059b 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -658,9 +658,6 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
 			return;	
 		} else
 #endif	
-#ifdef USE_ARM_GFX_ASM
-		asmDrawStripToScreen(height, width, text, src, _compositeBuf, vs->pitch, width, _textSurface.pitch);
-#else
 		if (_outputPixelFormat.bytesPerPixel == 2) {
 			const byte *srcPtr = (const byte *)src;
 			const byte *textPtr = (byte *)_textSurface.getBasePtr(x * m, y * m);
@@ -682,7 +679,11 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
 				srcPtr += vsPitch;
 				textPtr += _textSurface.pitch - width * m;
 			}
-		} else {
+		}
+#ifdef USE_ARM_GFX_ASM
+		asmDrawStripToScreen(height, width, text, src, _compositeBuf, vs->pitch, width, _textSurface.pitch);
+#else
+		else {
 			// We blit four pixels at a time, for improved performance.
 			const uint32 *src32 = (const uint32 *)src;
 			uint32 *dst32 = (uint32 *)_compositeBuf;






More information about the Scummvm-git-logs mailing list