From ad3e74670ba39c13172539e7f3da3f0486075f9a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 1 Dec 2015 04:00:09 +0100
Subject: [PATCH] Move shader_dir_list to runloop.c

---
 runloop.c | 43 +++++++++++++++++++------------------------
 runloop.h |  1 -
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/runloop.c b/runloop.c
index dec4d9d260..8ea7d0e4da 100644
--- a/runloop.c
+++ b/runloop.c
@@ -62,6 +62,8 @@
 
 static struct global g_extern;
 
+static rarch_dir_list_t runloop_shader_dir;
+
 static unsigned runloop_pending_windowed_scale;
 static char runloop_fullpath[PATH_MAX_LENGTH];
 static bool runloop_perfcnt_enable;
@@ -293,40 +295,34 @@ static void check_stateslots(settings_t *settings,
 
 void shader_dir_free(void)
 {
-   global_t *global = global_get_ptr();
-
-   if (!global)
-      return;
-
-   dir_list_free(global->dir.shader_dir.list);
-   global->dir.shader_dir.list = NULL;
-   global->dir.shader_dir.ptr  = 0;
+   dir_list_free(runloop_shader_dir.list);
+   runloop_shader_dir.list = NULL;
+   runloop_shader_dir.ptr  = 0;
 }
 
 bool shader_dir_init(void)
 {
    unsigned i;
-   global_t      *global = global_get_ptr();
    settings_t *settings  = config_get_ptr();
 
    if (!*settings->video.shader_dir)
       return false;
 
-   global->dir.shader_dir.list = dir_list_new_special(NULL, DIR_LIST_SHADERS, NULL);
+   runloop_shader_dir.list = dir_list_new_special(NULL, DIR_LIST_SHADERS, NULL);
 
-   if (!global->dir.shader_dir.list || global->dir.shader_dir.list->size == 0)
+   if (!runloop_shader_dir.list || runloop_shader_dir.list->size == 0)
    {
       event_command(EVENT_CMD_SHADER_DIR_DEINIT);
       return false;
    }
 
-   global->dir.shader_dir.ptr  = 0;
-   dir_list_sort(global->dir.shader_dir.list, false);
+   runloop_shader_dir.ptr  = 0;
+   dir_list_sort(runloop_shader_dir.list, false);
 
-   for (i = 0; i < global->dir.shader_dir.list->size; i++)
+   for (i = 0; i < runloop_shader_dir.list->size; i++)
       RARCH_LOG("%s \"%s\"\n",
             msg_hash_to_str(MSG_FOUND_SHADER),
-            global->dir.shader_dir.list->elems[i].data);
+            runloop_shader_dir.list->elems[i].data);
    return true;
 }
 
@@ -348,27 +344,26 @@ static void check_shader_dir(bool pressed_next, bool pressed_prev)
    const char *shader          = NULL;
    const char *ext             = NULL;
    enum rarch_shader_type type = RARCH_SHADER_NONE;
-   global_t *global            = global_get_ptr();
 
-   if (!global || !global->dir.shader_dir.list)
+   if (!runloop_shader_dir.list)
       return;
 
    if (pressed_next)
    {
-      global->dir.shader_dir.ptr = (global->dir.shader_dir.ptr + 1) %
-         global->dir.shader_dir.list->size;
+      runloop_shader_dir.ptr = (runloop_shader_dir.ptr + 1) %
+         runloop_shader_dir.list->size;
    }
    else if (pressed_prev)
    {
-      if (global->dir.shader_dir.ptr == 0)
-         global->dir.shader_dir.ptr = global->dir.shader_dir.list->size - 1;
+      if (runloop_shader_dir.ptr == 0)
+         runloop_shader_dir.ptr = runloop_shader_dir.list->size - 1;
       else
-         global->dir.shader_dir.ptr--;
+         runloop_shader_dir.ptr--;
    }
    else
       return;
 
-   shader   = global->dir.shader_dir.list->elems[global->dir.shader_dir.ptr].data;
+   shader   = runloop_shader_dir.list->elems[runloop_shader_dir.ptr].data;
    ext      = path_get_extension(shader);
    ext_hash = msg_hash_calculate(ext);
 
@@ -388,7 +383,7 @@ static void check_shader_dir(bool pressed_next, bool pressed_prev)
 
    snprintf(msg, sizeof(msg), "%s #%u: \"%s\".",
          msg_hash_to_str(MSG_SHADER),
-         (unsigned)global->dir.shader_dir.ptr, shader);
+         (unsigned)runloop_shader_dir.ptr, shader);
    rarch_main_msg_queue_push(msg, 1, 120, true);
    RARCH_LOG("%s \"%s\".\n",
          msg_hash_to_str(MSG_APPLYING_SHADER),
diff --git a/runloop.h b/runloop.h
index 282a00956c..6efd928537 100644
--- a/runloop.h
+++ b/runloop.h
@@ -92,7 +92,6 @@ typedef struct rarch_dir
 #ifdef HAVE_OVERLAY
    char osk_overlay[PATH_MAX_LENGTH];
 #endif
-   rarch_dir_list_t shader_dir;
    rarch_dir_list_t filter_dir;
 } rarch_dir_t;