mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Griffin) Buildfixes

Browse Source
This commit is contained in:
Twinaphex 2016-04-16 07:32:39 +02:00
parent 5bba5813cf
commit ae561de0c8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/drivers_shader/shader_gl_cg.c
View File

@ -62,7 +62,7 @@ struct cg_fbo_params
CGparameter coord; CGparameter coord;
}; };
struct shader_program_data struct shader_program_cg_data
{ {
CGprogram vprg; CGprogram vprg;
CGprogram fprg; CGprogram fprg;
@ -92,7 +92,7 @@ struct shader_program_data
typedef struct cg_shader_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 active_idx;
unsigned cg_attrib_idx; unsigned cg_attrib_idx;
CGprofile cgVProf; CGprofile cgVProf;
@ -105,7 +105,7 @@ typedef struct cg_shader_data
CGcontext cgCtx; CGcontext cgCtx;
} cg_shader_data_t; } 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; struct uniform_info *param = (struct uniform_info*)data;
CGparameter *cg_param = (CGparameter*)uniform_data; CGparameter *cg_param = (CGparameter*)uniform_data;
@ -618,7 +618,7 @@ static bool gl_cg_compile_program(
char *listing_f = NULL; char *listing_f = NULL;
char *listing_v = NULL; char *listing_v = NULL;
unsigned i, argc = 0; 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; cg_shader_data_t *cg_data = (cg_shader_data_t*)data;
if (!program) if (!program)
@ -942,7 +942,7 @@ static bool gl_cg_load_preset(void *data, const char *path)
} }
static void gl_cg_set_pass_attrib( static void gl_cg_set_pass_attrib(
struct shader_program_data *program, struct shader_program_cg_data *program,
struct cg_fbo_params *fbo, struct cg_fbo_params *fbo,
const char *attr) const char *attr)
{ {

10
gfx/drivers_shader/shader_glsl.c
View File

@ -58,7 +58,7 @@ struct cache_vbo
size_t size_secondary; size_t size_secondary;
}; };
struct shader_program_data struct shader_program_glsl_data
{ {
GLuint vprg; GLuint vprg;
GLuint fprg; GLuint fprg;
@ -264,7 +264,7 @@ typedef struct glsl_shader_data
char glsl_alias_define[1024]; char glsl_alias_define[1024];
unsigned glsl_active_index; unsigned glsl_active_index;
unsigned gl_attrib_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]; GLuint gl_teximage[GFX_MAX_TEXTURES];
GLint gl_attribs[PREV_TEXTURES + 2 + 4 + GFX_MAX_SHADERS]; GLint gl_attribs[PREV_TEXTURES + 2 + 4 + GFX_MAX_SHADERS];
state_tracker_t *gl_state_tracker; state_tracker_t *gl_state_tracker;
@ -435,7 +435,7 @@ static bool gl_glsl_compile_program(
struct shader_program_info *program_info) struct shader_program_info *program_info)
{ {
glsl_shader_data_t *glsl = (glsl_shader_data_t*)data; 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(); GLuint prog = glCreateProgram();
if (!program) if (!program)
@ -537,7 +537,7 @@ static bool gl_glsl_load_source_path(struct video_shader_pass *pass,
} }
static bool gl_glsl_compile_programs( 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; unsigned i;
@ -1053,7 +1053,7 @@ error:
static float t = 0; static float t = 0;
#endif #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; struct uniform_info *param = (struct uniform_info*)data;