From ae561de0c85d9e02ca6c3431287aa70e6779dd0d Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 16 Apr 2016 07:32:39 +0200
Subject: [PATCH] (Griffin) Buildfixes

---
 gfx/drivers_shader/shader_gl_cg.c | 10 +++++-----
 gfx/drivers_shader/shader_glsl.c  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 27d51acb77..40c736387e 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -62,7 +62,7 @@ struct cg_fbo_params
    CGparameter coord;
 };
 
-struct shader_program_data
+struct shader_program_cg_data
 {
    CGprogram vprg;
    CGprogram fprg;
@@ -92,7 +92,7 @@ struct shader_program_data
 
 typedef struct cg_shader_data
 {
-   struct shader_program_data prg[GFX_MAX_SHADERS];
+   struct shader_program_cg_data prg[GFX_MAX_SHADERS];
    unsigned active_idx;
    unsigned cg_attrib_idx;
    CGprofile cgVProf;
@@ -105,7 +105,7 @@ typedef struct cg_shader_data
    CGcontext cgCtx;
 } cg_shader_data_t;
 
-static void cg_uniform_set_parameter(void *data, struct shader_program_data *shader_data, void *uniform_data)
+static void cg_uniform_set_parameter(void *data, struct shader_program_cg_data *shader_data, void *uniform_data)
 {
    struct uniform_info *param = (struct uniform_info*)data;
    CGparameter      *cg_param = (CGparameter*)uniform_data;
@@ -618,7 +618,7 @@ static bool gl_cg_compile_program(
    char *listing_f  = NULL;
    char *listing_v  = NULL;
    unsigned i, argc = 0;
-   struct shader_program_data *program = (struct shader_program_data*)program_data;
+   struct shader_program_cg_data *program = (struct shader_program_cg_data*)program_data;
    cg_shader_data_t *cg_data = (cg_shader_data_t*)data;
 
    if (!program)
@@ -942,7 +942,7 @@ static bool gl_cg_load_preset(void *data, const char *path)
 }
 
 static void gl_cg_set_pass_attrib(
-      struct shader_program_data *program,
+      struct shader_program_cg_data *program,
       struct cg_fbo_params *fbo,
       const char *attr)
 {
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 1daff9d1d3..d849285501 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -58,7 +58,7 @@ struct cache_vbo
    size_t size_secondary;
 };
 
-struct shader_program_data
+struct shader_program_glsl_data
 {
    GLuint vprg;
    GLuint fprg;
@@ -264,7 +264,7 @@ typedef struct glsl_shader_data
    char glsl_alias_define[1024];
    unsigned glsl_active_index;
    unsigned gl_attrib_index;
-   struct shader_program_data prg[GFX_MAX_SHADERS];
+   struct shader_program_glsl_data prg[GFX_MAX_SHADERS];
    GLuint gl_teximage[GFX_MAX_TEXTURES];
    GLint gl_attribs[PREV_TEXTURES + 2 + 4 + GFX_MAX_SHADERS];
    state_tracker_t *gl_state_tracker;
@@ -435,7 +435,7 @@ static bool gl_glsl_compile_program(
       struct shader_program_info *program_info)
 {
    glsl_shader_data_t *glsl = (glsl_shader_data_t*)data;
-   struct shader_program_data *program = (struct shader_program_data*)program_data;
+   struct shader_program_glsl_data *program = (struct shader_program_glsl_data*)program_data;
    GLuint prog = glCreateProgram();
 
    if (!program)
@@ -537,7 +537,7 @@ static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
 }
 
 static bool gl_glsl_compile_programs(
-      glsl_shader_data_t *glsl, struct shader_program_data *program)
+      glsl_shader_data_t *glsl, struct shader_program_glsl_data *program)
 {
    unsigned i;
 
@@ -1053,7 +1053,7 @@ error:
 static float t = 0;
 
 #endif
-static void glsl_uniform_set_parameter(void *data, struct shader_program_data *shader_data, void *uniform_data)
+static void glsl_uniform_set_parameter(void *data, struct shader_program_glsl_data *shader_data, void *uniform_data)
 {
    struct uniform_info *param = (struct uniform_info*)data;