aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorLars Persson2008-02-03 12:30:11 +0000
committerLars Persson2008-02-03 12:30:11 +0000
commitc6595e3bd20bb603b71e394eff5a41e7a945b8b7 (patch)
tree1f7b445d6c99c1030557e764bd3b225229719534 /engines
parent2e28552a7e74b3dcfe4716fda902c265ccce7f28 (diff)
downloadscummvm-rg350-c6595e3bd20bb603b71e394eff5a41e7a945b8b7.tar.gz
scummvm-rg350-c6595e3bd20bb603b71e394eff5a41e7a945b8b7.tar.bz2
scummvm-rg350-c6595e3bd20bb603b71e394eff5a41e7a945b8b7.zip
Changed ASM names to match those in the ARM asm implementations
svn-id: r30758
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/gfx.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index e6663af855..2ca50a725c 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -37,17 +37,18 @@
#include "scumm/util.h"
#ifdef USE_ARM_GFX_ASM
-extern "C" void DrawStripToScreenARM(int height, int width, byte const* text, byte const* src, byte* dst,
+extern "C" void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
int vsPitch, int vmScreenWidth, int textSurfacePitch);
-extern "C" void Copy8ColARM(byte* dst, int dstPitch, const byte* src, int height);
+extern "C" void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
#endif /* USE_ARM_GFX_ASM */
namespace Scumm {
static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, int h);
static void fill(byte *dst, int dstPitch, byte color, int w, int h);
-
+#ifndef ARM_USE_GFX_ASM
static void copy8Col(byte *dst, int dstPitch, const byte *src, int height);
+#endif
static void clear8Col(byte *dst, int dstPitch, int height);
static void ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height);
@@ -625,7 +626,7 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
// but also more complicated to implement, and incurs a bigger overhead when
// writing to the text surface.
#ifdef ARM_USE_GFX_ASM
- DrawStripToScreenARM(height, width, text, src, dst, vs->pitch, width, _textSurface.pitch);
+ asmDrawStripToScreen(height, width, text, src, dst, vs->pitch, width, _textSurface.pitch);
#else
for (int h = 0; h < height * m; ++h) {
for (int w = 0; w < width * m; ++w) {
@@ -1079,7 +1080,7 @@ static void fill(byte *dst, int dstPitch, byte color, int w, int h) {
#ifdef ARM_USE_GFX_ASM
-#define copy8Col(A,B,C,D) copy8ColARM(A,B,C,D)
+#define copy8Col(A,B,C,D) asmCopy8Col(A,B,C,D)
#else