diff options
| author | David-John Willis | 2012-10-21 18:43:07 +0100 |
|---|---|---|
| committer | David-John Willis | 2012-10-21 18:43:07 +0100 |
| commit | e7921438cd92848a5f94c59c798039036f8dd9b6 (patch) | |
| tree | dcdeb6132bfb1a03c4e7a61210bb1eea45a831c2 /graphics/scaler | |
| parent | b25ed0a02f22aa1bcee826c6843870b299b0c1ed (diff) | |
| download | scummvm-rg350-e7921438cd92848a5f94c59c798039036f8dd9b6.tar.gz scummvm-rg350-e7921438cd92848a5f94c59c798039036f8dd9b6.tar.bz2 scummvm-rg350-e7921438cd92848a5f94c59c798039036f8dd9b6.zip | |
GRAPHICS: Rename NEON_ASPECT_CORRECTOR to USE_ARM_NEON_ASPECT_CORRECTOR
* This better matches other ARM codepaths.
* Also remove #ifdef OPENPANDORA as moved to configure.
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/aspect.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp index 327e7c5e89..92d6c5777e 100644 --- a/graphics/scaler/aspect.cpp +++ b/graphics/scaler/aspect.cpp @@ -23,11 +23,7 @@ #include "graphics/scaler/intern.h" #include "graphics/scaler/aspect.h" -#ifdef OPENPANDORA -#define NEON_ASPECT_CORRECTOR -#endif - -#ifdef NEON_ASPECT_CORRECTOR +#ifdef USE_ARM_NEON_ASPECT_CORRECTOR #include <arm_neon.h> #endif @@ -62,7 +58,7 @@ static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint1 #if ASPECT_MODE == kVeryFastAndGoodAspectMode -#ifdef NEON_ASPECT_CORRECTOR +#ifdef USE_ARM_NEON_ASPECT_CORRECTOR template<typename ColorMask> static void interpolate5LineNeon(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width, int k1, int k2) { @@ -97,31 +93,31 @@ static void interpolate5LineNeon(uint16 *dst, const uint16 *srcA, const uint16 * width -= 4; } } -#endif +#endif // USE_ARM_NEON_ASPECT_CORRECTOR template<typename ColorMask, int scale> static void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int width) { if (scale == 1) { -#ifdef NEON_ASPECT_CORRECTOR +#ifdef USE_NEON_ASPECT_CORRECTOR int width4 = width & ~3; interpolate5LineNeon<ColorMask>(dst, srcA, srcB, width4, 7, 1); srcA += width4; srcB += width4; dst += width4; width -= width4; -#endif +#endif // USE_ARM_NEON_ASPECT_CORRECTOR while (width--) { *dst++ = interpolate16_7_1<ColorMask>(*srcB++, *srcA++); } } else { -#ifdef NEON_ASPECT_CORRECTOR +#ifdef USE_ARM_NEON_ASPECT_CORRECTOR int width4 = width & ~3; interpolate5LineNeon<ColorMask>(dst, srcA, srcB, width4, 5, 3); srcA += width4; srcB += width4; dst += width4; width -= width4; -#endif +#endif // USE_ARM_NEON_ASPECT_CORRECTOR while (width--) { *dst++ = interpolate16_5_3<ColorMask>(*srcB++, *srcA++); } |