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

(retroarch.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-27 02:16:24 +02:00
parent 3e25770e45
commit 767a866573
2 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
retroarch.c
View File

@ -1104,38 +1104,6 @@ void rarch_main_free(void)
config_free();
}
#define FAIL_CPU(simd_type) do { \
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
rarch_fail(1, "validate_cpu_features()"); \
} while(0)
/* validate_cpu_features:
*
* Validates CPU features for given processor architecture.
*
* Make sure we haven't compiled for something we cannot run.
* Ideally, code would get swapped out depending on CPU support,
* but this will do for now.
*/
static void validate_cpu_features(void)
{
uint64_t cpu = retro_get_cpu_features();
(void)cpu;
#ifdef __SSE__
if (!(cpu & RETRO_SIMD_SSE))
FAIL_CPU("SSE");
#endif
#ifdef __SSE2__
if (!(cpu & RETRO_SIMD_SSE2))
FAIL_CPU("SSE2");
#endif
#ifdef __AVX__
if (!(cpu & RETRO_SIMD_AVX))
FAIL_CPU("AVX");
#endif
}
/**
* rarch_init_system_av_info:
*
@ -1190,7 +1158,7 @@ int rarch_main_init(int argc, char *argv[])
RARCH_LOG_OUTPUT("=================================================\n");
}
validate_cpu_features();
rarch_ctl(RARCH_ACTION_STATE_VALIDATE_CPU_FEATURES, NULL);
config_load();
{
@ -1347,6 +1315,11 @@ void rarch_main_init_wrap(const struct rarch_main_wrap *args,
#endif
}
#define FAIL_CPU(simd_type) do { \
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
rarch_fail(1, "validate_cpu_features()"); \
} while(0)
bool rarch_ctl(enum rarch_ctl_state state, void *data)
{
driver_t *driver = driver_get_ptr();
@ -1433,6 +1406,25 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
case RARCH_ACTION_STATE_FORCE_QUIT:
rarch_ctl(RARCH_ACTION_STATE_QUIT, NULL);
break;
case RARCH_ACTION_STATE_VALIDATE_CPU_FEATURES:
{
uint64_t cpu = retro_get_cpu_features();
(void)cpu;
#ifdef __SSE__
if (!(cpu & RETRO_SIMD_SSE))
FAIL_CPU("SSE");
#endif
#ifdef __SSE2__
if (!(cpu & RETRO_SIMD_SSE2))
FAIL_CPU("SSE2");
#endif
#ifdef __AVX__
if (!(cpu & RETRO_SIMD_AVX))
FAIL_CPU("AVX");
#endif
}
break;
case RARCH_ACTION_STATE_VERIFY_API_VERSION:
RARCH_LOG("Version of libretro API: %u\n", pretro_api_version());
RARCH_LOG("Compiled against API: %u\n", RETRO_API_VERSION);

30
retroarch.h
View File

@ -56,26 +56,42 @@ extern "C" {
enum rarch_ctl_state
{
RARCH_ACTION_STATE_NONE = 0,
RARCH_ACTION_STATE_LOAD_CONTENT,
#ifdef HAVE_FFMPEG
RARCH_ACTION_STATE_LOAD_CONTENT_FFMPEG,
#endif
RARCH_ACTION_STATE_LOAD_CONTENT_IMAGEVIEWER,
RARCH_ACTION_STATE_MENU_RUNNING,
RARCH_ACTION_STATE_MENU_RUNNING_FINISHED,
/* Replaces currently loaded configuration file with
* another one. Will load a dummy core to flush state
* properly. */
RARCH_ACTION_STATE_REPLACE_CONFIG,
RARCH_ACTION_STATE_QUIT,
RARCH_ACTION_STATE_FORCE_QUIT,
/* Compare libretro core API version against API version
* used by RetroArch.
*
* TODO - when libretro v2 gets added, allow for switching
* between libretro version backend dynamically.
*/
RARCH_ACTION_STATE_VERIFY_API_VERSION
/* Compare libretro core API version against API version
* used by RetroArch.
*
* TODO - when libretro v2 gets added, allow for switching
* between libretro version backend dynamically.
*/
RARCH_ACTION_STATE_VERIFY_API_VERSION,
/* Validates CPU features for given processor architecture.
*
* Make sure we haven't compiled for something we cannot run.
* Ideally, code would get swapped out depending on CPU support,
* but this will do for now. */
RARCH_ACTION_STATE_VALIDATE_CPU_FEATURES
};
enum rarch_content_type