Move more of these static variables out of retroarch_data.h

This commit is contained in:
twinaphex 2021-04-15 17:51:39 +02:00
parent 0f4dbcfc53
commit 9812f368e7
2 changed files with 7 additions and 11 deletions

View File

@ -5876,6 +5876,10 @@ static bool menu_shader_manager_operate_auto_preset(
char config_directory[PATH_MAX_LENGTH];
char tmp[PATH_MAX_LENGTH];
char file[PATH_MAX_LENGTH];
static enum rarch_shader_type shader_types[] =
{
RARCH_SHADER_GLSL, RARCH_SHADER_SLANG, RARCH_SHADER_CG
};
const char *core_name = system ? system->library_name : NULL;
const char *auto_preset_dirs[3] = {0};
@ -5944,13 +5948,13 @@ static bool menu_shader_manager_operate_auto_preset(
{
/* remove all supported auto-shaders of given type */
char *end;
size_t i, j, n, m;
size_t i, j, m;
char preset_path[PATH_MAX_LENGTH];
/* n = amount of relevant shader presets found
* m = amount of successfully deleted shader presets */
n = m = 0;
size_t n = m = 0;
for (i = 0; i < ARRAY_SIZE(auto_preset_dirs); i++)
{

View File

@ -2611,16 +2611,7 @@ struct key_desc key_descriptors[RARCH_MAX_KEYS] =
{RETROK_UNDO, "Undo"},
{RETROK_OEM_102, "OEM-102"}
};
#endif
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
static enum rarch_shader_type shader_types[] =
{
RARCH_SHADER_GLSL, RARCH_SHADER_SLANG, RARCH_SHADER_CG
};
#endif
#ifdef HAVE_MENU
static void *null_menu_init(void **userdata, bool video_is_threaded)
{
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
@ -2628,6 +2619,7 @@ static void *null_menu_init(void **userdata, bool video_is_threaded)
return NULL;
return menu;
}
static int null_menu_list_bind_init(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx) { return 0; }