This commit is contained in:
twinaphex 2015-02-06 17:26:01 +01:00
parent 0d624defaa
commit 7bc3a2892d

View File

@ -24,6 +24,7 @@
#endif #endif
#ifdef RARCH_INTERNAL #ifdef RARCH_INTERNAL
#include "../performance.h"
#include "../libretro.h" #include "../libretro.h"
#else #else
#include "../libretro/libretro.h" #include "../libretro/libretro.h"
@ -398,6 +399,15 @@ void audio_convert_float_to_s16_ALLEGREX(int16_t *out,
} }
#endif #endif
static unsigned audio_convert_get_cpu_features(void)
{
#ifdef RARCH_INTERNAL
return rarch_get_cpu_features();
#else
return perf_get_cpu_features_cb();
#endif
}
/** /**
* audio_convert_init_simd: * audio_convert_init_simd:
* *
@ -406,8 +416,10 @@ void audio_convert_float_to_s16_ALLEGREX(int16_t *out,
**/ **/
void audio_convert_init_simd(void) void audio_convert_init_simd(void)
{ {
unsigned cpu = audio_convert_get_cpu_features();
(void)cpu;
#if defined(__ARM_NEON__) #if defined(__ARM_NEON__)
unsigned cpu = rarch_get_cpu_features();
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 ?