From b0548e132929d67d585af4fe8881708e5d7797ab Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 19 Jan 2015 21:09:39 +0100
Subject: [PATCH] Properly namespace video_shader_parse.c functions

---
 gfx/d3d/d3d.cpp                   |  6 ++---
 gfx/drivers/gl.c                  |  2 +-
 gfx/drivers_shader/shader_gl_cg.c |  8 +++---
 gfx/drivers_shader/shader_glsl.c  |  6 ++---
 gfx/drivers_shader/shader_hlsl.c  |  2 +-
 gfx/video_shader_parse.c          | 44 +++++++++++++++----------------
 gfx/video_shader_parse.h          | 20 +++++++-------
 menu/menu_entries_cbs.c           |  8 +++---
 menu/menu_shader.c                | 24 ++++++++---------
 9 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 1c8fe7320e..28f1d9fc7c 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -618,7 +618,7 @@ static bool d3d_construct(d3d_video_t *d3d,
     * to avoid set_shader() to be overridden
     * later. */
    enum rarch_shader_type type = 
-      gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
+      video_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
    if (g_settings.video.shader_enable && type == RARCH_SHADER_CG)
       d3d->cg_shader = g_settings.video.shader_path;
 
@@ -1149,7 +1149,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
 
    memset(&d3d->shader, 0, sizeof(d3d->shader));
 
-   if (!gfx_shader_read_conf_cgp(conf, &d3d->shader))
+   if (!video_shader_read_conf_cgp(conf, &d3d->shader))
    {
       config_file_free(conf);
       RARCH_ERR("Failed to parse CGP file.\n");
@@ -1158,7 +1158,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
 
    config_file_free(conf);
 
-   gfx_shader_resolve_relative(&d3d->shader, d3d->cg_shader.c_str());
+   video_shader_resolve_relative(&d3d->shader, d3d->cg_shader.c_str());
 
    RARCH_LOG("[D3D9 Meta-Cg] Found %u shaders.\n", d3d->shader.passes);
 
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index b799f1b42b..5dc4359bae 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -224,7 +224,7 @@ static bool gl_shader_init(gl_t *gl)
       return false;
    }
 
-   type = gfx_shader_parse_type(shader_path,
+   type = video_shader_parse_type(shader_path,
       gl->core_context ? RARCH_SHADER_GLSL : DEFAULT_SHADER_TYPE);
 
    if (type == RARCH_SHADER_NONE)
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index b7fe044c63..aa12faced6 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -590,7 +590,7 @@ static bool load_plain(cg_shader_data_t *cg, const char *path)
       cg->prg[1] = cg->prg[0];
    }
 
-   gfx_shader_resolve_parameters(NULL, cg->cg_shader);
+   video_shader_resolve_parameters(NULL, cg->cg_shader);
    return true;
 }
 
@@ -676,15 +676,15 @@ static bool load_preset(cg_shader_data_t *cg, const char *path)
    if (!cg->cg_shader)
       return false;
 
-   if (!gfx_shader_read_conf_cgp(conf, cg->cg_shader))
+   if (!video_shader_read_conf_cgp(conf, cg->cg_shader))
    {
       RARCH_ERR("Failed to parse CGP file.\n");
       config_file_free(conf);
       return false;
    }
 
-   gfx_shader_resolve_relative(cg->cg_shader, path);
-   gfx_shader_resolve_parameters(conf, cg->cg_shader);
+   video_shader_resolve_relative(cg->cg_shader, path);
+   video_shader_resolve_parameters(conf, cg->cg_shader);
    config_file_free(conf);
 
    if (cg->cg_shader->passes > GFX_MAX_SHADERS - 3)
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 9e8b7c77c9..c9f99cba45 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -764,7 +764,7 @@ static bool gl_glsl_init(void *data, const char *path)
          conf = config_file_new(path);
          if (conf)
          {
-            ret = gfx_shader_read_conf_cgp(conf, glsl->glsl_shader);
+            ret = video_shader_read_conf_cgp(conf, glsl->glsl_shader);
             glsl->glsl_shader->modern = true;
          }
          else
@@ -792,8 +792,8 @@ static bool gl_glsl_init(void *data, const char *path)
       glsl->glsl_shader->modern = true;
    }
 
-   gfx_shader_resolve_relative(glsl->glsl_shader, path);
-   gfx_shader_resolve_parameters(conf, glsl->glsl_shader);
+   video_shader_resolve_relative(glsl->glsl_shader, path);
+   video_shader_resolve_parameters(conf, glsl->glsl_shader);
 
    if (conf)
    {
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index 7ea74449ab..2a26c2d7cf 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/gfx/drivers_shader/shader_hlsl.c
@@ -316,7 +316,7 @@ static bool load_preset(hlsl_shader_data_t *hlsl, void *data, const char *path)
    if (!hlsl->cg_shader)
       return false;
 
-   if (!gfx_shader_read_conf_cgp(conf, hlsl->cg_shader))
+   if (!video_shader_read_conf_cgp(conf, hlsl->cg_shader))
    {
       RARCH_ERR("Failed to parse CGP file.\n");
       config_file_free(conf);
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 4944ab8b39..81f6ccfdf7 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -73,7 +73,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
 }
 
 /** 
- * shader_parse_pass:
+ * video_shader_parse_pass:
  * @conf              : Preset file to read from.
  * @pass              : Shader passes handle.
  * @i                 : Index of shader pass.
@@ -82,7 +82,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass, unsigned i)
+static bool video_shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass, unsigned i)
 {
    char shader_name[64], filter_name_buf[64], wrap_name_buf[64], wrap_mode[64];
    char frame_count_mod_buf[64], srgb_output_buf[64], fp_fbo_buf[64];
@@ -244,7 +244,7 @@ static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass,
 }
 
 /** 
- * shader_parse_textures:
+ * video_shader_parse_textures:
  * @conf              : Preset file to read from.
  * @shader            : Shader pass handle.
  *
@@ -252,7 +252,7 @@ static bool shader_parse_pass(config_file_t *conf, struct gfx_shader_pass *pass,
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-static bool shader_parse_textures(config_file_t *conf,
+static bool video_shader_parse_textures(config_file_t *conf,
       struct gfx_shader *shader)
 {
    const char *id;
@@ -303,7 +303,7 @@ static bool shader_parse_textures(config_file_t *conf,
 }
 
 /** 
- * shader_parse_find_parameter:
+ * video_shader_parse_find_parameter:
  * @params            : Shader parameter handle.
  * @num_params        : Number of shader params in @params.
  * @id                : Identifier to search for.
@@ -312,7 +312,7 @@ static bool shader_parse_textures(config_file_t *conf,
  *
  * Returns: handle to shader parameter if successful, otherwise NULL.
  **/
-static struct gfx_shader_parameter *shader_parse_find_parameter(
+static struct video_shader_parameter *video_shader_parse_find_parameter(
       struct gfx_shader_parameter *params, unsigned num_params, const char *id)
 {
    unsigned i;
@@ -327,7 +327,7 @@ static struct gfx_shader_parameter *shader_parse_find_parameter(
 }
 
 /** 
- * gfx_shader_resolve_parameters:
+ * video_shader_resolve_parameters:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
@@ -335,7 +335,7 @@ static struct gfx_shader_parameter *shader_parse_find_parameter(
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool gfx_shader_resolve_parameters(config_file_t *conf,
+bool video_shader_resolve_parameters(config_file_t *conf,
       struct gfx_shader *shader)
 {
    unsigned i;
@@ -399,7 +399,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
             id = strtok_r(NULL, ";", &save))
       {
          struct gfx_shader_parameter *parameter = (struct gfx_shader_parameter*)
-            shader_parse_find_parameter(shader->parameters, shader->num_parameters, id);
+            video_shader_parse_find_parameter(shader->parameters, shader->num_parameters, id);
 
          if (!parameter)
          {
@@ -416,7 +416,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
 }
 
 /** 
- * shader_parse_imports:
+ * video_shader_parse_imports:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
@@ -424,7 +424,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-static bool shader_parse_imports(config_file_t *conf,
+static bool video_shader_parse_imports(config_file_t *conf,
       struct gfx_shader *shader)
 {
    char imports[1024];
@@ -525,7 +525,7 @@ static bool shader_parse_imports(config_file_t *conf,
 }
 
 /** 
- * gfx_shader_read_conf_cgp:
+ * video_shader_read_conf_cgp:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
@@ -534,7 +534,7 @@ static bool shader_parse_imports(config_file_t *conf,
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool gfx_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader)
+bool video_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader)
 {
    unsigned shaders, i;
 
@@ -557,14 +557,14 @@ bool gfx_shader_read_conf_cgp(config_file_t *conf, struct gfx_shader *shader)
    shader->passes = min(shaders, GFX_MAX_SHADERS);
    for (i = 0; i < shader->passes; i++)
    {
-      if (!shader_parse_pass(conf, &shader->pass[i], i))
+      if (!video_shader_parse_pass(conf, &shader->pass[i], i))
          return false;
    }
 
-   if (!shader_parse_textures(conf, shader))
+   if (!video_shader_parse_textures(conf, shader))
       return false;
 
-   if (!shader_parse_imports(conf, shader))
+   if (!video_shader_parse_imports(conf, shader))
       return false;
 
    return true;
@@ -693,14 +693,14 @@ static void shader_write_variable(config_file_t *conf,
 }
 
 /** 
- * gfx_shader_write_conf_cgp:
+ * video_shader_write_conf_cgp:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
  * Saves preset and all associated state (passes,
  * textures, imports, etc) to disk. 
  **/
-void gfx_shader_write_conf_cgp(config_file_t *conf,
+void video_shader_write_conf_cgp(config_file_t *conf,
       struct gfx_shader *shader)
 {
    unsigned i;
@@ -819,7 +819,7 @@ void gfx_shader_write_conf_cgp(config_file_t *conf,
 }
 
 /**
- * gfx_shader_parse_type:
+ * video_shader_parse_type:
  * @path              : Shader path.
  * @fallback          : Fallback shader type in case no
  *                      type could be found.
@@ -829,7 +829,7 @@ void gfx_shader_write_conf_cgp(config_file_t *conf,
  * Returns: value of shader type on success, otherwise will return
  * user-supplied @fallback value. 
  **/
-enum rarch_shader_type gfx_shader_parse_type(const char *path,
+enum rarch_shader_type video_shader_parse_type(const char *path,
       enum rarch_shader_type fallback)
 {
    const char *ext = NULL;
@@ -848,14 +848,14 @@ enum rarch_shader_type gfx_shader_parse_type(const char *path,
 }
 
 /**
- * gfx_shader_resolve_relative:
+ * video_shader_resolve_relative:
  * @shader            : Shader pass handle.
  * @ref_path          : Relative shader path.
  *
  * Resolves relative shader path (@ref_path) into absolute
  * shader paths.
  **/
-void gfx_shader_resolve_relative(struct gfx_shader *shader,
+void video_shader_resolve_relative(struct gfx_shader *shader,
       const char *ref_path)
 {
    unsigned i;
diff --git a/gfx/video_shader_parse.h b/gfx/video_shader_parse.h
index d220dd4d03..29593be60c 100644
--- a/gfx/video_shader_parse.h
+++ b/gfx/video_shader_parse.h
@@ -153,7 +153,7 @@ struct gfx_shader
 };
 
 /** 
- * gfx_shader_read_conf_cgp:
+ * video_shader_read_conf_cgp:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
@@ -162,33 +162,33 @@ struct gfx_shader
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool gfx_shader_read_conf_cgp(config_file_t *conf,
+bool video_shader_read_conf_cgp(config_file_t *conf,
       struct gfx_shader *shader);
 
 /** 
- * gfx_shader_write_conf_cgp:
+ * video_shader_write_conf_cgp:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
  * Saves preset and all associated state (passes,
  * textures, imports, etc) to disk. 
  **/
-void gfx_shader_write_conf_cgp(config_file_t *conf,
+void video_shader_write_conf_cgp(config_file_t *conf,
       struct gfx_shader *shader);
 
 /**
- * gfx_shader_resolve_relative:
+ * video_shader_resolve_relative:
  * @shader            : Shader pass handle.
  * @ref_path          : Relative shader path.
  *
  * Resolves relative shader path (@ref_path) into absolute
  * shader paths.
  **/
-void gfx_shader_resolve_relative(struct gfx_shader *shader,
+void video_shader_resolve_relative(struct gfx_shader *shader,
       const char *ref_path);
 
 /** 
- * gfx_shader_resolve_parameters:
+ * video_shader_resolve_parameters:
  * @conf              : Preset file to read from.
  * @shader            : Shader passes handle.
  *
@@ -196,11 +196,11 @@ void gfx_shader_resolve_relative(struct gfx_shader *shader,
  *
  * Returns: true (1) if successful, otherwise false (0).
  **/
-bool gfx_shader_resolve_parameters(config_file_t *conf,
+bool video_shader_resolve_parameters(config_file_t *conf,
       struct gfx_shader *shader);
 
 /**
- * gfx_shader_parse_type:
+ * video_shader_parse_type:
  * @path              : Shader path.
  * @fallback          : Fallback shader type in case no
  *                      type could be found.
@@ -210,7 +210,7 @@ bool gfx_shader_resolve_parameters(config_file_t *conf,
  * Returns: value of shader type on success, otherwise will return
  * user-supplied @fallback value. 
  **/
-enum rarch_shader_type gfx_shader_parse_type(const char *path,
+enum rarch_shader_type video_shader_parse_type(const char *path,
       enum rarch_shader_type fallback);
 
 #ifdef __cplusplus
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 5a87d235f6..5d2884c9b2 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -279,7 +279,7 @@ static int action_ok_shader_pass_load(const char *path,
          sizeof(driver.menu->shader->pass[hack_shader_pass].source.path));
 
    /* This will reset any changed parameters. */
-   gfx_shader_resolve_parameters(NULL, driver.menu->shader);
+   video_shader_resolve_parameters(NULL, driver.menu->shader);
    menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
    return 0;
 #else
@@ -414,7 +414,7 @@ static int action_ok_shader_preset_load(const char *path,
 
    fill_pathname_join(shader_path, menu_path, path, sizeof(shader_path));
    menu_shader_manager_set_preset(driver.menu->shader,
-         gfx_shader_parse_type(shader_path, RARCH_SHADER_NONE),
+         video_shader_parse_type(shader_path, RARCH_SHADER_NONE),
          shader_path);
    menu_list_flush_stack_by_needle(driver.menu->menu_list, "Shader Options");
    return 0;
@@ -1349,7 +1349,7 @@ static int action_start_shader_num_passes(unsigned type, const char *label,
       shader->passes = 0;
    driver.menu->need_refresh = true;
 
-   gfx_shader_resolve_parameters(NULL, driver.menu->shader);
+   video_shader_resolve_parameters(NULL, driver.menu->shader);
 #endif
    return 0;
 }
@@ -1425,7 +1425,7 @@ static int action_toggle_shader_num_passes(unsigned type, const char *label,
    }
 
    if (driver.menu->need_refresh)
-      gfx_shader_resolve_parameters(NULL, driver.menu->shader);
+      video_shader_resolve_parameters(NULL, driver.menu->shader);
 
 #endif
    return 0;
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index e9ad91825a..8042084307 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -70,10 +70,10 @@ void menu_shader_manager_init(void *data)
       conf = config_file_new(g_settings.video.shader_path);
       if (conf)
       {
-         if (gfx_shader_read_conf_cgp(conf, shader))
+         if (video_shader_read_conf_cgp(conf, shader))
          {
-            gfx_shader_resolve_relative(shader, g_settings.video.shader_path);
-            gfx_shader_resolve_parameters(conf, shader);
+            video_shader_resolve_relative(shader, g_settings.video.shader_path);
+            video_shader_resolve_parameters(conf, shader);
          }
          config_file_free(conf);
       }
@@ -100,10 +100,10 @@ void menu_shader_manager_init(void *data)
 
       if (conf)
       {
-         if (gfx_shader_read_conf_cgp(conf, shader))
+         if (video_shader_read_conf_cgp(conf, shader))
          {
-            gfx_shader_resolve_relative(shader, preset_path);
-            gfx_shader_resolve_parameters(conf, shader);
+            video_shader_resolve_relative(shader, preset_path);
+            video_shader_resolve_parameters(conf, shader);
          }
          config_file_free(conf);
       }
@@ -155,10 +155,10 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
 
    RARCH_LOG("Setting Menu shader: %s.\n", preset_path ? preset_path : "N/A (stock)");
 
-   if (gfx_shader_read_conf_cgp(conf, shader))
+   if (video_shader_read_conf_cgp(conf, shader))
    {
-      gfx_shader_resolve_relative(shader, preset_path);
-      gfx_shader_resolve_parameters(conf, shader);
+      video_shader_resolve_relative(shader, preset_path);
+      video_shader_resolve_parameters(conf, shader);
    }
    config_file_free(conf);
 
@@ -227,7 +227,7 @@ void menu_shader_manager_save_preset(
 
    if (!(conf = (config_file_t*)config_file_new(NULL)))
       return;
-   gfx_shader_write_conf_cgp(conf, driver.menu->shader);
+   video_shader_write_conf_cgp(conf, driver.menu->shader);
 
    for (d = 0; d < ARRAY_SIZE(dirs); d++)
    {
@@ -275,7 +275,7 @@ unsigned menu_shader_manager_get_type(const struct gfx_shader *shader)
    for (i = 0; i < shader->passes; i++)
    {
       enum rarch_shader_type pass_type = 
-         gfx_shader_parse_type(shader->pass[i].source.path,
+         video_shader_parse_type(shader->pass[i].source.path,
             RARCH_SHADER_NONE);
 
       switch (pass_type)
@@ -315,7 +315,7 @@ void menu_shader_manager_apply_changes(void)
 
    /* Fall-back */
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
-   shader_type = gfx_shader_parse_type("", DEFAULT_SHADER_TYPE);
+   shader_type = video_shader_parse_type("", DEFAULT_SHADER_TYPE);
 #endif
 
    if (shader_type == RARCH_SHADER_NONE)