[Scummvm-cvs-logs] SF.net SVN: scummvm: [29728] scummvm/trunk/backends/platform/ds/arm9/source

tramboi at users.sourceforge.net tramboi at users.sourceforge.net
Thu Dec 6 00:16:13 CET 2007


Revision: 29728
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29728&view=rev
Author:   tramboi
Date:     2007-12-05 15:16:12 -0800 (Wed, 05 Dec 2007)

Log Message:
-----------
NDS : params reordering to match C scaler and ARM one

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
    scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp	2007-12-05 22:52:34 UTC (rev 29727)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.cpp	2007-12-05 23:16:12 UTC (rev 29728)
@@ -356,7 +356,7 @@
 }
 
 #ifdef PERFECT_5_TO_4_RESCALING
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride)
+void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette)
 {
 	u32 fastRam[768];
 
@@ -377,7 +377,7 @@
 	}
 }
 #else
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride)
+void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette)
 {
 	u16 fastRam[256];
     for (size_t i=0; i<128; ++i)

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2007-12-05 22:52:34 UTC (rev 29727)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2007-12-05 23:16:12 UTC (rev 29728)
@@ -32,7 +32,7 @@
 void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst, 
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
 void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride);
+void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette);
 void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
 
 }
@@ -44,7 +44,7 @@
 void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst, 
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
 void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride);
+void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette);
 void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
 
 }

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s	2007-12-05 22:52:34 UTC (rev 29727)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s	2007-12-05 23:16:12 UTC (rev 29728)
@@ -254,8 +254,6 @@
 	@                                      int         srcStride,
 	@                                      const u16  *pal);
 	@
-	@ This is a slight reordering of the params from the existing C one.
-	@ Sorry, but it makes the code easier.
 Rescale_320x256xPAL8_To_256x256x1555:
 	@ r0 = dst
 	@ r1 = src

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2007-12-05 22:52:34 UTC (rev 29727)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2007-12-05 23:16:12 UTC (rev 29728)
@@ -811,10 +811,10 @@
 		const u8* back = (const u8*)get8BitBackBuffer();
 		u16* base = BG_GFX + 0x10000;
 		Rescale_320x256xPAL8_To_256x256x1555( base,
-											      back,
-											      BG_PALETTE,
-											      256,
-											      512);
+											  back,											  
+                                              256,
+											  512,
+                                              BG_PALETTE );
         
         #ifdef SCALER_PROFILE
         u16 t1 = TIMER1_DATA;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list