mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 21:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change callback prototype

Browse Source
This commit is contained in:
twinaphex 2016-04-16 19:41:48 +02:00
parent 1230edf1ee
commit 0b7ee2fcf7
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/drivers_shader/shader_gl_cg.c
View File

@ -112,13 +112,12 @@ struct uniform_cg_data
static void gl_cg_set_uniform_parameter( static void gl_cg_set_uniform_parameter(
void *data, void *data,
void *uniform_info_data, struct uniform_info *param,
void *_shader_info_data, void *_shader_info_data,
void *uniform_data) void *uniform_data)
{ {
CGparameter location; CGparameter location;
cg_shader_data_t *cg_data = (cg_shader_data_t*)data; cg_shader_data_t *cg_data = (cg_shader_data_t*)data;
struct uniform_info *param = (struct uniform_info*)uniform_info_data;
struct shader_program_cg_data *shader_data = (struct shader_program_cg_data*)_shader_info_data; struct shader_program_cg_data *shader_data = (struct shader_program_cg_data*)_shader_info_data;
if (!param || !param->enabled) if (!param || !param->enabled)

3
gfx/drivers_shader/shader_glsl.c
View File

@ -1051,13 +1051,12 @@ error:
static void gl_glsl_set_uniform_parameter( static void gl_glsl_set_uniform_parameter(
void *data, void *data,
void *uniform_info_data, struct uniform_info *param,
void *shader_info_data, void *shader_info_data,
void *uniform_data) void *uniform_data)
{ {
GLint location = 0; GLint location = 0;
glsl_shader_data_t *glsl = (glsl_shader_data_t*)data; glsl_shader_data_t *glsl = (glsl_shader_data_t*)data;
struct uniform_info *param = (struct uniform_info*)uniform_info_data;
struct shader_program_glsl_data *shader_data = (struct shader_program_glsl_data*)shader_info_data; struct shader_program_glsl_data *shader_data = (struct shader_program_glsl_data*)shader_info_data;
if (!param) if (!param)

3
gfx/drivers_shader/shader_hlsl.c
View File

@ -105,12 +105,11 @@ void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value)
static void hlsl_uniform_set_parameter( static void hlsl_uniform_set_parameter(
void *data, void *data,
void *uniform_info_data, struct uniform_info *param,
void *_shader_info_data, void *_shader_info_data,
void *uniform_data) void *uniform_data)
{ {
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data; hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
struct uniform_info *param = (struct uniform_info*)uniform_info_data;
struct shader_program_hlsl_data *shader_data = (struct shader_program_hlsl_data*)_shader_info_data; struct shader_program_hlsl_data *shader_data = (struct shader_program_hlsl_data*)_shader_info_data;
(void)hlsl; (void)hlsl;

2
gfx/drivers_shader/shader_null.c
View File

@ -76,7 +76,7 @@ static void shader_null_set_params(void *data, void *shader_data,
static void shader_null_set_uniform_parameter( static void shader_null_set_uniform_parameter(
void *data, void *data,
void *uniform_info_data, struct uniform_info *param,
void *shader_info_data, void *shader_info_data,
void *uniform_data) void *uniform_data)
{ {

2
gfx/video_shader_driver.h
View File

@ -163,7 +163,7 @@ typedef struct shader_backend
const void *prev_info, const void *prev_info,
const void *feedback_info, const void *feedback_info,
const void *fbo_info, unsigned fbo_info_cnt); const void *fbo_info, unsigned fbo_info_cnt);
void (*set_uniform_parameter)(void *data, void *uniform_info_data, void (*set_uniform_parameter)(void *data, struct uniform_info *param,
void *shader_info_data, void *uniform_data); void *shader_info_data, void *uniform_data);
bool (*compile_program)(void *data, unsigned idx, bool (*compile_program)(void *data, unsigned idx,
void *program_data, struct shader_program_info *program_info); void *program_data, struct shader_program_info *program_info);