[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.93,1.94

Chris Apers chrilith at users.sourceforge.net
Sat Dec 3 11:01:03 CET 2005


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6303

Modified Files:
	display.cpp 
Log Message:
Not needed anymore :)

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- display.cpp	5 Nov 2005 18:12:41 -0000	1.93
+++ display.cpp	3 Dec 2005 19:00:32 -0000	1.94
@@ -28,11 +28,6 @@
 #include "queen/queen.h"
 #include "queen/resource.h"
 
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
 namespace Queen {
 
 #ifdef PALMOS_68K
@@ -569,19 +564,6 @@
 	uint8 *dst = _screenBuf;
 	const uint8 *src = _backdropBuf + _horizontalScroll;
 
-#ifdef PALMOS_68K
-	ARM_START(CopyRectangleType)
-		ARM_INIT(COMMON_COPYRECT)
-		ARM_ADDM(dst)
-		ARM_ADDV(buf, src)
-		ARM_ADDV(pitch, BACKDROP_W)
-		ARM_ADDV(_offScreenPitch, SCREEN_W)
-		ARM_ADDV(w, SCREEN_W)
-		ARM_ADDM(h)
-		ARM_CALL(ARM_COMMON, PNO_DATA())
-	ARM_END()
-#endif
-
 	while (h--) {
 		memcpy(dst, src, SCREEN_W);
 		dst += SCREEN_W;
@@ -696,23 +678,6 @@
 	assert(w <= dstPitch);
 	dstBuf += dstPitch * y + x;
 
-#ifdef PALMOS_68K
-	ARM_CHECK_EXEC(w > 8 && h > 8)
-		ARM_START(BlitType)
-			ARM_INIT(QUEEN_BLIT)
-			ARM_ADDM(dstBuf)
-			ARM_ADDM(dstPitch)
-			ARM_ADDM(srcBuf)
-			ARM_ADDM(srcPitch)
-			ARM_ADDM(w)
-			ARM_ADDM(h)
-			ARM_ADDM(xflip)
-			ARM_ADDM(masked)
-			ARM_CALL(ARM_ENGINE, PNO_DATA())
-		ARM_END()
-	ARM_CHECK_END()
-#endif
-
 	if (!masked) { // Unmasked always unflipped
 		while (h--) {
 			memcpy(dstBuf, srcBuf, w);





More information about the Scummvm-git-logs mailing list