aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds/arm9/source
diff options
context:
space:
mode:
authorBertrand Augereau2006-12-09 14:14:58 +0000
committerBertrand Augereau2006-12-09 14:14:58 +0000
commitdfb325b88b3e13e2e6d157371a1b83b9c5bc51fa (patch)
treeffa4fb3666837c7f5aaa675f002775d92e5dda06 /backends/platform/ds/arm9/source
parent308f46aa9e28e14a759b1f478f1e40c6696650df (diff)
downloadscummvm-rg350-dfb325b88b3e13e2e6d157371a1b83b9c5bc51fa.tar.gz
scummvm-rg350-dfb325b88b3e13e2e6d157371a1b83b9c5bc51fa.tar.bz2
scummvm-rg350-dfb325b88b3e13e2e6d157371a1b83b9c5bc51fa.zip
NDS : Scaler cleaning
svn-id: r24821
Diffstat (limited to 'backends/platform/ds/arm9/source')
-rw-r--r--backends/platform/ds/arm9/source/blitters.cpp4
-rw-r--r--backends/platform/ds/arm9/source/blitters.h2
-rw-r--r--backends/platform/ds/arm9/source/dsmain.cpp5
3 files changed, 3 insertions, 8 deletions
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 4760fa484b..0858789061 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -271,7 +271,7 @@ static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3
}
// Can't work in place
-void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u32* palette)
+static inline void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u32* palette)
{
ComputeDivBy5TableIFN();
@@ -289,7 +289,7 @@ void Rescale_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, cons
// Can work in place, because it's a contraction
-void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src)
+static inline void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src)
{
ComputeDivBy5TableIFN();
diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h
index b24ceb7f7d..a365420182 100644
--- a/backends/platform/ds/arm9/source/blitters.h
+++ b/backends/platform/ds/arm9/source/blitters.h
@@ -26,8 +26,6 @@ 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_320xPAL8Scanline_To_256x1555Scanline(u16* dest, const u8* src, const u16* palette);
-void Rescale_320x1555Scanline_To_256x1555Scanline(u16* dest, const u16* src);
void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, const u16* palette, int destStride, int srcStride);
void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index a15534e770..1367c72260 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -701,10 +701,7 @@ void displayMode16BitFlipBuffer() {
if (cpuScaler)
{
- for(int i=0; i<200; ++i)
- {
- DS::Rescale_320x1555Scanline_To_256x1555Scanline(BG_GFX+i*512, back+i*512);
- }
+ Rescale_320x256x1555_To_256x256x1555(BG_GFX, back, 512, 512);
}
else
{