diff options
| author | Max Horn | 2009-01-27 14:48:49 +0000 |
|---|---|---|
| committer | Max Horn | 2009-01-27 14:48:49 +0000 |
| commit | b6c17e396ba2dc1994c8f75105be5598cacafb59 (patch) | |
| tree | 195d8dac1f2af7f284c23abd25b541384c7521c6 /graphics/scaler | |
| parent | 34e76afb1636fec8ca668d4c238a4d4551f23622 (diff) | |
| download | scummvm-rg350-b6c17e396ba2dc1994c8f75105be5598cacafb59.tar.gz scummvm-rg350-b6c17e396ba2dc1994c8f75105be5598cacafb59.tar.bz2 scummvm-rg350-b6c17e396ba2dc1994c8f75105be5598cacafb59.zip | |
Re-enabled ASM versions of HQx scalers (oops)
svn-id: r36099
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/hq2x.cpp | 6 | ||||
| -rw-r--r-- | graphics/scaler/hq3x.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index df1c34626f..8f9221a297 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -38,11 +38,11 @@ void hq2x_16(const byte *, byte *, uint32, uint32, uint32, uint32); } -void HQ2x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { hq2x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch); } -#endif +#else #define PIXEL00_0 *(q) = w5; #define PIXEL00_10 *(q) = interpolate16_3_1<ColorMask>(w5, w1); @@ -118,3 +118,5 @@ void HQ2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, else HQ2x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height); } + +#endif // Assembly version diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp index b40c85d56a..ef17a467fc 100644 --- a/graphics/scaler/hq3x.cpp +++ b/graphics/scaler/hq3x.cpp @@ -39,11 +39,11 @@ void hq3x_16(const byte *, byte *, uint32, uint32, uint32, uint32); } -void HQ3x_ASM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { +void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { hq3x_16(srcPtr, dstPtr, width, height, srcPitch, dstPitch); } -#endif +#else #define PIXEL00_1M *(q) = interpolate16_3_1<ColorMask>(w5, w1); #define PIXEL00_1U *(q) = interpolate16_3_1<ColorMask>(w5, w2); @@ -121,3 +121,5 @@ void HQ3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, else HQ3x_555(srcPtr, srcPitch, dstPtr, dstPitch, width, height); } + +#endif // Assembly version |