From e58c9dc179827c26628d5b6c325bc27756bbeae5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 1 Oct 2014 12:49:21 +0200
Subject: [PATCH] Move init_shader_dir/deinit_shader_dir to retroarch.c and
 make them non-static functions

---
 driver.c    | 34 ++--------------------------------
 general.h   |  4 ++++
 retroarch.c | 33 ++++++++++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/driver.c b/driver.c
index 450429bc77..0fed5f4fa4 100644
--- a/driver.c
+++ b/driver.c
@@ -926,13 +926,6 @@ static void deinit_pixel_converter(void)
    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)
 {
    double avg_fps = 0.0;
@@ -1317,29 +1310,6 @@ error:
    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)
 {
    /* This function can be called multiple times
@@ -1374,7 +1344,7 @@ void init_video_input(void)
 
    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;
    max_dim = max(geom->max_width, geom->max_height);
@@ -1552,7 +1522,7 @@ void uninit_video_input(void)
 
    rarch_deinit_filter();
 
-   deinit_shader_dir();
+   rarch_deinit_shader_dir();
    compute_monitor_fps_statistics();
 }
 
diff --git a/general.h b/general.h
index 5b6448703d..09cf7be092 100644
--- a/general.h
+++ b/general.h
@@ -830,6 +830,10 @@ void rarch_update_system_info(struct retro_system_info *info,
 void rarch_recording_dump_frame(const void *data, unsigned width,
       unsigned height, size_t pitch);
 
+void rarch_init_shader_dir(void);
+
+void rarch_deinit_shader_dir(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/retroarch.c b/retroarch.c
index 3d7ad59dda..c60a21ab5c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3426,9 +3426,6 @@ bool rarch_main_iterate(void)
    return true;
 }
 
-
-
-
 void rarch_main_deinit(void)
 {
 #ifdef HAVE_NETPLAY
@@ -3462,3 +3459,33 @@ void rarch_main_deinit(void)
 
    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;
+}