mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-24 04:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-05-11 21:48:30 +02:00
parent 1abe81b222
commit 367150b487
3 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/video_texture_image.c
View File

@ -29,7 +29,9 @@
#ifdef HAVE_RPNG
#include <formats/rpng.h>
#endif
#ifdef HAVE_RJPEG
#include <formats/rjpeg.h>
#endif
#include <formats/tga.h>
#include "../general.h"
@ -276,9 +278,11 @@ bool video_texture_image_load(struct texture_image *out_img,
#endif
break;
case IMAGE_FORMAT_JPEG:
#ifdef HAVE_RJPEG
if (rjpeg_image_load((uint8_t*)ptr, out_img, file_len,
a_shift, r_shift, g_shift, b_shift))
goto success;
#endif
break;
default:
case IMAGE_FORMAT_NONE:

53
retroarch.c
View File

@ -1211,6 +1211,34 @@ bool retroarch_validate_game_options(char *s, size_t len, bool mkdir)
return true;
}
#define FAIL_CPU(simd_type) do { \
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
retroarch_fail(1, "validate_cpu_features()"); \
} while(0)
/* 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 retroarch_validate_cpu_features(void)
{
uint64_t cpu = cpu_features_get();
(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
}
/**
* retroarch_main_init:
* @argc : Count of (commandline) arguments.
@ -1254,7 +1282,7 @@ bool retroarch_main_init(int argc, char *argv[])
RARCH_LOG_OUTPUT("=================================================\n");
}
rarch_ctl(RARCH_CTL_VALIDATE_CPU_FEATURES, NULL);
retroarch_validate_cpu_features();
config_load();
runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
@ -1324,10 +1352,6 @@ error:
return false;
}
#define FAIL_CPU(simd_type) do { \
RARCH_ERR(simd_type " code is compiled in, but CPU does not support this feature. Cannot continue.\n"); \
retroarch_fail(1, "validate_cpu_features()"); \
} while(0)
bool rarch_ctl(enum rarch_ctl_state state, void *data)
{
@ -1482,25 +1506,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
command_event(CMD_EVENT_OVERLAY_INIT, NULL);
#endif
break;
case RARCH_CTL_VALIDATE_CPU_FEATURES:
{
uint64_t cpu = cpu_features_get();
(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_CTL_NONE:
default:
return false;

7
retroarch.h
View File

@ -81,13 +81,6 @@ enum rarch_ctl_state
RARCH_CTL_MENU_RUNNING_FINISHED,
/* 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_CTL_VALIDATE_CPU_FEATURES,
RARCH_CTL_SET_PATHS_REDIRECT,
RARCH_CTL_SET_SRAM_ENABLE,