HAVE_NEON define seems to give problems - WANT_NEON seems to work

- so quick-fix hack for now
This commit is contained in:
twinaphex 2012-12-03 00:20:21 +01:00
parent 63cf9247f1
commit 7403faa608
3 changed files with 5 additions and 5 deletions

View File

@ -15,8 +15,8 @@ LOCAL_CFLAGS += -DANDROID_X86 -DHAVE_SSSE3
endif endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS += -mfpu=neon LOCAL_CFLAGS += -DANDROID_ARM_V7
LOCAL_CFLAGS += -DANDROID_ARM_V7 -DHAVE_NEON LOCAL_CFLAGS += -DWANT_NEON
LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon
endif endif

View File

@ -123,7 +123,7 @@ rarch_resampler_t *resampler_new(void)
RARCH_LOG("Sinc resampler [AVX]\n"); RARCH_LOG("Sinc resampler [AVX]\n");
#elif defined(__SSE__) #elif defined(__SSE__)
RARCH_LOG("Sinc resampler [SSE]\n"); RARCH_LOG("Sinc resampler [SSE]\n");
#elif defined(HAVE_NEON) #elif defined(WANT_NEON)
RARCH_LOG("Sinc resampler [NEON]\n"); RARCH_LOG("Sinc resampler [NEON]\n");
#else #else
RARCH_LOG("Sinc resampler [C]\n"); RARCH_LOG("Sinc resampler [C]\n");
@ -210,7 +210,7 @@ static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
// movehl { X, R, X, L } == { X, R, X, R } // movehl { X, R, X, L } == { X, R, X, R }
_mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum)); _mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
} }
#elif defined(HAVE_NEON) #elif defined(WANT_NEON)
void process_sinc_neon_asm(float *out, const float *left, const float *right, const float *coeff); void process_sinc_neon_asm(float *out, const float *left, const float *right, const float *coeff);
static void process_sinc(rarch_resampler_t *resamp, float *out_buffer) static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
{ {

View File

@ -247,7 +247,7 @@ FIFO BUFFER
/*============================================================ /*============================================================
AUDIO HERMITE AUDIO HERMITE
============================================================ */ ============================================================ */
#ifdef HAVE_NEON #ifdef WANT_NEON
#include "../../audio/sinc.c" #include "../../audio/sinc.c"
#else #else
#include "../../audio/hermite.c" #include "../../audio/hermite.c"