[Scummvm-cvs-logs] scummvm master -> 686775138dbd2553c966f066dea53b90360bdcb3
djwillis
John.Willis at Distant-earth.com
Sun Oct 21 19:54:46 CEST 2012
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e7921438cd GRAPHICS: Rename NEON_ASPECT_CORRECTOR to USE_ARM_NEON_ASPECT_CORRECTOR
686775138d CONFIGURE: Clean up OpenPandora flags and add define for USE_ARM_NEON_ASPECT_CORRECTOR
Commit: e7921438cd92848a5f94c59c798039036f8dd9b6
https://github.com/scummvm/scummvm/commit/e7921438cd92848a5f94c59c798039036f8dd9b6
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2012-10-21T10:43:07-07:00
Commit Message:
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.
Changed paths:
graphics/scaler/aspect.cpp
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp
index 327e7c5..92d6c57 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++);
}
Commit: 686775138dbd2553c966f066dea53b90360bdcb3
https://github.com/scummvm/scummvm/commit/686775138dbd2553c966f066dea53b90360bdcb3
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2012-10-21T10:46:58-07:00
Commit Message:
CONFIGURE: Clean up OpenPandora flags and add define for USE_ARM_NEON_ASPECT_CORRECTOR
Changed paths:
configure
diff --git a/configure b/configure
index a0119bb..8b9a9e9 100755
--- a/configure
+++ b/configure
@@ -2525,10 +2525,13 @@ if test -n "$_host"; then
# Use -O3 on the OpenPandora for non-debug builds.
_optimization_level=-O3
fi
+ define_in_config_if_yes yes 'USE_ARM_NEON_ASPECT_CORRECTOR'
CXXFLAGS="$CXXFLAGS -march=armv7-a"
CXXFLAGS="$CXXFLAGS -mtune=cortex-a8"
+ CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp"
CXXFLAGS="$CXXFLAGS -mfpu=neon"
- ASFLAGS="$ASFLAGS -mfloat-abi=soft"
+ CXXFLAGS="$CXXFLAGS -fsingle-precision-constant"
+ ASFLAGS="$ASFLAGS -mfloat-abi=softfp"
_backend="openpandora"
_build_hq_scalers=yes
_vkeybd=no
More information about the Scummvm-git-logs
mailing list