ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(NEON) Change WANT_NEON define back to HAVE_NEON

This commit is contained in:
twinaphex 2012-12-04 07:57:31 +01:00
parent d03b6afeb8
commit 2c2328d8a0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/native/jni/Android.mk
View File

@ -2,7 +2,7 @@ RARCH_VERSION = "0.9.8-beta3"
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
PERF_TEST := 1 PERF_TEST := 1
HAVE_OPENSL := 1 HAVE_OPENSL := 1
WANT_NEON := 1 HAVE_NEON := 1
HAVE_SINC := 1 HAVE_SINC := 1
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -18,12 +18,12 @@ endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(WANT_NEON),1) ifeq ($(HAVE_NEON),1)
LOCAL_CFLAGS += -DWANT_NEON LOCAL_CFLAGS += -DHAVE_NEON
endif endif
ifeq ($(HAVE_SINC),1) ifeq ($(HAVE_SINC),1)
ifeq ($(WANT_NEON),1) ifeq ($(HAVE_NEON),1)
LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon
endif endif
LOCAL_CFLAGS += -DHAVE_SINC LOCAL_CFLAGS += -DHAVE_SINC

4
audio/sinc.c
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(WANT_NEON) #elif defined(HAVE_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(WANT_NEON) #elif defined(HAVE_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)
{ {