From 2fa87013f1e132db15dd931d705c842cf5074de1 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 8 Jan 2016 20:58:44 +0100
Subject: [PATCH] Cleanups

---
 gfx/drivers_shader/shader_gl_cg.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 3e67f138f1..d9ae10ed6b 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -449,7 +449,7 @@ static void gl_cg_deinit(void *data)
       listing_##type = strdup(list); \
 }
 
-static bool load_program(void *data, unsigned idx, const char *prog, bool path_is_file)
+static bool gl_cg_load_program(void *data, unsigned idx, const char *prog, bool path_is_file)
 {
    const char *argv[2 + GFX_MAX_SHADERS];
    bool ret         = true;
@@ -510,7 +510,7 @@ static void set_program_base_attrib(void *data, unsigned i);
 
 static bool load_stock(void *data)
 {
-   if (!load_program(data, 0, stock_cg_program, false))
+   if (!gl_cg_load_program(data, 0, stock_cg_program, false))
    {
       RARCH_ERR("Failed to compile passthrough shader, is something wrong with your environment?\n");
       return false;
@@ -538,7 +538,7 @@ static bool load_plain(void *data, const char *path)
       RARCH_LOG("Loading Cg file: %s\n", path);
       strlcpy(cg_data->shader->pass[0].source.path, path,
             sizeof(cg_data->shader->pass[0].source.path));
-      if (!load_program(data, 1, path, true))
+      if (!gl_cg_load_program(data, 1, path, true))
          return false;
    }
    else
@@ -604,14 +604,14 @@ static bool gl_cg_load_imports(void *data)
    return true;
 }
 
-static bool load_shader(void *data, unsigned i)
+static bool gl_cg_load_shader(void *data, unsigned i)
 {
    cg_shader_data_t *cg_data = (cg_shader_data_t*)data;
 
    RARCH_LOG("Loading Cg shader: \"%s\".\n",
          cg_data->shader->pass[i].source.path);
 
-   if (!load_program(data, i + 1,
+   if (!gl_cg_load_program(data, i + 1,
             cg_data->shader->pass[i].source.path, true))
       return false;
 
@@ -669,7 +669,7 @@ static bool load_preset(void *data, const char *path)
 
    for (i = 0; i < cg_data->shader->passes; i++)
    {
-      if (!load_shader(cg_data, i))
+      if (!gl_cg_load_shader(cg_data, i))
       {
          RARCH_ERR("Failed to load shaders ...\n");
          return false;