mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-02 23:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Vita) Remove -U__ARM_NEON__

Browse Source
This commit is contained in:
Francisco José García García 2015-09-18 01:21:24 +02:00
parent dd58492fa6
commit 50172454d2
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.griffin
View File

@ -202,7 +202,7 @@ else ifeq ($(platform), vita)
EXT_TARGET := $(TARGET_NAME)_$(platform).velf EXT_TARGET := $(TARGET_NAME)_$(platform).velf
EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
MACHDEP := -DVITA MACHDEP := -DVITA
PLATCFLAGS := -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant -U__ARM_NEON__ PLATCFLAGS := -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant
LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub \ LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub \
-lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \ -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
-lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lz -lm -lc -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lz -lm -lc
@ -213,6 +213,7 @@ else ifeq ($(platform), vita)
LIBDIRS += -L. LIBDIRS += -L.
LDFLAGS += -Wl,-q LDFLAGS += -Wl,-q
HAVE_FILTERS_BUILTIN := 1
HAVE_LIBRETRO_MANAGEMENT := 1 HAVE_LIBRETRO_MANAGEMENT := 1
HAVE_BUILTIN_AUTOCONFIG := 1 HAVE_BUILTIN_AUTOCONFIG := 1
HAVE_RPNG := 1 HAVE_RPNG := 1

4
audio/audio_utils.c
View File

@ -215,7 +215,7 @@ void audio_convert_float_to_s16_altivec(int16_t *out,
} }
audio_convert_float_to_s16_C(out, in, samples_in); audio_convert_float_to_s16_C(out, in, samples_in);
} }
#elif defined(__ARM_NEON__) #elif defined(__ARM_NEON__) && !defined(VITA)
/* Avoid potential hard-float/soft-float ABI issues. */ /* Avoid potential hard-float/soft-float ABI issues. */
void audio_convert_s16_float_asm(float *out, const int16_t *in, void audio_convert_s16_float_asm(float *out, const int16_t *in,
size_t samples, const float *gain); size_t samples, const float *gain);
@ -426,7 +426,7 @@ void audio_convert_init_simd(void)
unsigned cpu = audio_convert_get_cpu_features(); unsigned cpu = audio_convert_get_cpu_features();
(void)cpu; (void)cpu;
#if defined(__ARM_NEON__) #if defined(__ARM_NEON__) && !defined(VITA)
audio_convert_s16_to_float_arm = cpu & RETRO_SIMD_NEON ? audio_convert_s16_to_float_arm = cpu & RETRO_SIMD_NEON ?
audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C; audio_convert_s16_to_float_neon : audio_convert_s16_to_float_C;
audio_convert_float_to_s16_arm = cpu & RETRO_SIMD_NEON ? audio_convert_float_to_s16_arm = cpu & RETRO_SIMD_NEON ?

2
audio/audio_utils.h
View File

@ -93,7 +93,7 @@ void audio_convert_s16_to_float_altivec(float *out,
void audio_convert_float_to_s16_altivec(int16_t *out, void audio_convert_float_to_s16_altivec(int16_t *out,
const float *in, size_t samples); const float *in, size_t samples);
#elif defined(__ARM_NEON__) #elif defined(__ARM_NEON__) && !defined(VITA)
#define audio_convert_s16_to_float audio_convert_s16_to_float_arm #define audio_convert_s16_to_float audio_convert_s16_to_float_arm
#define audio_convert_float_to_s16 audio_convert_float_to_s16_arm #define audio_convert_float_to_s16 audio_convert_float_to_s16_arm

7
audio/drivers_resampler/sinc.c
View File

@ -334,7 +334,7 @@ static void process_sinc(rarch_sinc_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(__ARM_NEON__) #elif defined(__ARM_NEON__) && !defined(VITA)
#if SINC_COEFF_LERP #if SINC_COEFF_LERP
#error "NEON asm does not support SINC lerp." #error "NEON asm does not support SINC lerp."
@ -437,7 +437,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
} }
/* Be SIMD-friendly. */ /* Be SIMD-friendly. */
#if (defined(__AVX__) && ENABLE_AVX) || defined(__ARM_NEON__) #if (defined(__AVX__) && ENABLE_AVX) || (defined(__ARM_NEON__)&& !defined(VITA))
re->taps = (re->taps + 7) & ~7; re->taps = (re->taps + 7) & ~7;
#else #else
re->taps = (re->taps + 3) & ~3; re->taps = (re->taps + 3) & ~3;
@ -460,7 +460,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
init_sinc_table(re, cutoff, re->phase_table, init_sinc_table(re, cutoff, re->phase_table,
1 << PHASE_BITS, re->taps, SINC_COEFF_LERP); 1 << PHASE_BITS, re->taps, SINC_COEFF_LERP);
#if defined(__ARM_NEON__) #if defined(__ARM_NEON__) && !defined(VITA)
process_sinc_func = mask & RESAMPLER_SIMD_NEON process_sinc_func = mask & RESAMPLER_SIMD_NEON
? process_sinc_neon : process_sinc_C; ? process_sinc_neon : process_sinc_C;
#endif #endif
@ -480,4 +480,3 @@ rarch_resampler_t sinc_resampler = {
"sinc", "sinc",
"sinc" "sinc"
}; };