diff options
author | Bertrand Augereau | 2007-12-05 23:16:12 +0000 |
---|---|---|
committer | Bertrand Augereau | 2007-12-05 23:16:12 +0000 |
commit | 0070e3da126f72262037a0d75d11e05e940f0a06 (patch) | |
tree | 8c1337300a5c1d1d2918437b722701de88a3b2e0 | |
parent | e82f4a25acbc02601c76f86c3539a37f1af9665b (diff) | |
download | scummvm-rg350-0070e3da126f72262037a0d75d11e05e940f0a06.tar.gz scummvm-rg350-0070e3da126f72262037a0d75d11e05e940f0a06.tar.bz2 scummvm-rg350-0070e3da126f72262037a0d75d11e05e940f0a06.zip |
NDS : params reordering to match C scaler and ARM one
svn-id: r29728
-rw-r--r-- | backends/platform/ds/arm9/source/blitters.cpp | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/blitters.h | 4 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/blitters_arm.s | 2 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 8 |
4 files changed, 8 insertions, 10 deletions
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index 9522dbc9cb..ddd1785daa 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -356,7 +356,7 @@ static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const } #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 @@ void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* p } } #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) diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h index fe6966fdae..f8c65ed167 100644 --- a/backends/platform/ds/arm9/source/blitters.h +++ b/backends/platform/ds/arm9/source/blitters.h @@ -32,7 +32,7 @@ namespace DS { 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 @@ extern "C" { 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); } diff --git a/backends/platform/ds/arm9/source/blitters_arm.s b/backends/platform/ds/arm9/source/blitters_arm.s index 2f14c5a140..fdf409a570 100644 --- a/backends/platform/ds/arm9/source/blitters_arm.s +++ b/backends/platform/ds/arm9/source/blitters_arm.s @@ -254,8 +254,6 @@ xLoop3: @ 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 diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index 7c9e1b503b..42d6451381 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -811,10 +811,10 @@ void displayMode16BitFlipBuffer() { 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; |