From e36712a4e0d6621396a39d2e6eef697efdaae10a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 7 Dec 2015 14:45:15 +0100
Subject: [PATCH] Turn shader_dir_init and shader_dir_free into static
 functions

---
 command_event.c | 4 ++--
 runloop.c       | 9 +++++++--
 runloop.h       | 6 ++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/command_event.c b/command_event.c
index 762a2b3725..c8c5a2b3cc 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1390,12 +1390,12 @@ bool event_command(enum event_command cmd)
 #endif
          break;
       case EVENT_CMD_SHADER_DIR_DEINIT:
-         shader_dir_free();
+         runloop_ctl(RUNLOOP_CTL_SHADER_DIR_DEINIT, NULL);
          break;
       case EVENT_CMD_SHADER_DIR_INIT:
          event_command(EVENT_CMD_SHADER_DIR_DEINIT);
 
-         if (!shader_dir_init())
+         if (!runloop_ctl(RUNLOOP_CTL_SHADER_DIR_INIT, NULL))
             return false;
          break;
       case EVENT_CMD_SAVEFILES:
diff --git a/runloop.c b/runloop.c
index 0896dd4665..11af4db46c 100644
--- a/runloop.c
+++ b/runloop.c
@@ -302,14 +302,14 @@ static void check_stateslots(settings_t *settings,
 #define SHADER_EXT_CG        0x0059776fU
 #define SHADER_EXT_CGP       0x0b8865bfU
 
-void shader_dir_free(void)
+static void shader_dir_free(void)
 {
    dir_list_free(runloop_shader_dir.list);
    runloop_shader_dir.list = NULL;
    runloop_shader_dir.ptr  = 0;
 }
 
-bool shader_dir_init(void)
+static bool shader_dir_init(void)
 {
    unsigned i;
    settings_t *settings  = config_get_ptr();
@@ -495,6 +495,11 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
 
    switch (state)
    {
+      case RUNLOOP_CTL_SHADER_DIR_DEINIT:
+         shader_dir_free();
+         return true;
+      case RUNLOOP_CTL_SHADER_DIR_INIT:
+         return shader_dir_init();
       case RUNLOOP_CTL_SYSTEM_INFO_INIT:
          core.retro_get_system_info(&system->info);
 
diff --git a/runloop.h b/runloop.h
index 6719811949..cd1e907925 100644
--- a/runloop.h
+++ b/runloop.h
@@ -90,6 +90,8 @@ enum runloop_ctl_state
    RUNLOOP_CTL_CORE_OPTIONS_GET,
    RUNLOOP_CTL_CORE_OPTIONS_INIT,
    RUNLOOP_CTL_CORE_OPTIONS_DEINIT,
+   RUNLOOP_CTL_SHADER_DIR_DEINIT,
+   RUNLOOP_CTL_SHADER_DIR_INIT,
    RUNLOOP_CTL_SYSTEM_INFO_INIT,
    RUNLOOP_CTL_SYSTEM_INFO_FREE,
    RUNLOOP_CTL_PREPARE_DUMMY
@@ -305,10 +307,6 @@ const char *rarch_main_msg_queue_pull(void);
 
 bool *runloop_perfcnt_enabled(void);
 
-void shader_dir_free(void);
-
-bool shader_dir_init(void);
-
 bool runloop_ctl(enum runloop_ctl_state state, void *data);
 
 typedef int (*transfer_cb_t)(void *data, size_t len);