mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move init_shader_dir/deinit_shader_dir to retroarch.c and make them

Browse Source 
non-static functions
This commit is contained in:
twinaphex 2014-10-01 12:49:21 +02:00
parent 19372d5ce6
commit e58c9dc179
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
driver.c
View File

@ -926,13 +926,6 @@ static void deinit_pixel_converter(void)
driver.scaler_out = NULL; driver.scaler_out = NULL;
} }
static void deinit_shader_dir(void)
{
dir_list_free(g_extern.shader_dir.list);
g_extern.shader_dir.list = NULL;
g_extern.shader_dir.ptr = 0;
}
static void compute_monitor_fps_statistics(void) static void compute_monitor_fps_statistics(void)
{ {
double avg_fps = 0.0; double avg_fps = 0.0;
@ -1317,29 +1310,6 @@ error:
rarch_deinit_filter(); rarch_deinit_filter();
} }
static void init_shader_dir(void)
{
unsigned i;
if (!*g_settings.video.shader_dir)
return;
g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir,
"cg|cgp|glsl|glslp", false);
if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
{
deinit_shader_dir();
return;
}
g_extern.shader_dir.ptr = 0;
dir_list_sort(g_extern.shader_dir.list, false);
for (i = 0; i < g_extern.shader_dir.list->size; i++)
RARCH_LOG("Found shader \"%s\"\n",
g_extern.shader_dir.list->elems[i].data);
}
static bool init_video_pixel_converter(unsigned size) static bool init_video_pixel_converter(unsigned size)
{ {
/* This function can be called multiple times /* This function can be called multiple times
@ -1374,7 +1344,7 @@ void init_video_input(void)
rarch_init_filter(g_extern.system.pix_fmt); rarch_init_filter(g_extern.system.pix_fmt);
init_shader_dir(); rarch_init_shader_dir();
geom = (const struct retro_game_geometry*)&g_extern.system.av_info.geometry; geom = (const struct retro_game_geometry*)&g_extern.system.av_info.geometry;
max_dim = max(geom->max_width, geom->max_height); max_dim = max(geom->max_width, geom->max_height);
@ -1552,7 +1522,7 @@ void uninit_video_input(void)
rarch_deinit_filter(); rarch_deinit_filter();
deinit_shader_dir(); rarch_deinit_shader_dir();
compute_monitor_fps_statistics(); compute_monitor_fps_statistics();
} }

4
general.h
View File

@ -830,6 +830,10 @@ void rarch_update_system_info(struct retro_system_info *info,
void rarch_recording_dump_frame(const void *data, unsigned width, void rarch_recording_dump_frame(const void *data, unsigned width,
unsigned height, size_t pitch); unsigned height, size_t pitch);
void rarch_init_shader_dir(void);
void rarch_deinit_shader_dir(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

33
retroarch.c
View File

@ -3426,9 +3426,6 @@ bool rarch_main_iterate(void)
return true; return true;
} }
void rarch_main_deinit(void) void rarch_main_deinit(void)
{ {
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
@ -3462,3 +3459,33 @@ void rarch_main_deinit(void)
g_extern.main_is_init = false; g_extern.main_is_init = false;
} }
void rarch_init_shader_dir(void)
{
unsigned i;
if (!*g_settings.video.shader_dir)
return;
g_extern.shader_dir.list = dir_list_new(g_settings.video.shader_dir,
"cg|cgp|glsl|glslp", false);
if (!g_extern.shader_dir.list || g_extern.shader_dir.list->size == 0)
{
rarch_deinit_shader_dir();
return;
}
g_extern.shader_dir.ptr = 0;
dir_list_sort(g_extern.shader_dir.list, false);
for (i = 0; i < g_extern.shader_dir.list->size; i++)
RARCH_LOG("Found shader \"%s\"\n",
g_extern.shader_dir.list->elems[i].data);
}
void rarch_deinit_shader_dir(void)
{
dir_list_free(g_extern.shader_dir.list);
g_extern.shader_dir.list = NULL;
g_extern.shader_dir.ptr = 0;
}