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

Change function signature of uniform_set_parameter

Browse Source
This commit is contained in:
twinaphex 2016-04-16 07:39:41 +02:00
parent 00c7d918e9
commit f45d2db0b1
3 changed files with 9 additions and 6 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

@ -105,10 +105,11 @@ 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_cg_data *shader_data, void *uniform_data) static void cg_uniform_set_parameter(void *data, void *_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;
struct shader_program_cg_data *shader_data = (struct shader_program_cg_data*)_shader_data;
if (!param || !param->enabled) if (!param || !param->enabled)
return; return;

3
gfx/drivers_shader/shader_glsl.c
View File

@ -1053,9 +1053,10 @@ error:
static float t = 0; static float t = 0;
#endif #endif
static void glsl_uniform_set_parameter(void *data, struct shader_program_glsl_data *shader_data, void *uniform_data) static void glsl_uniform_set_parameter(void *data, void *_shader_data, void *uniform_data)
{ {
struct uniform_info *param = (struct uniform_info*)data; struct uniform_info *param = (struct uniform_info*)data;
struct shader_program_glsl_data *shader_data = (struct shader_program_glsl_data*)_shader_data;
if (!param) if (!param)
return; return;

9
gfx/drivers_shader/shader_hlsl.c
View File

@ -64,7 +64,7 @@ static const char *stock_hlsl_program =
" return OUT;\n" " return OUT;\n"
"}\n"; "}\n";
struct shader_program_data struct shader_program_hlsl_data
{ {
LPDIRECT3DVERTEXSHADER vprg; LPDIRECT3DVERTEXSHADER vprg;
LPDIRECT3DPIXELSHADER fprg; LPDIRECT3DPIXELSHADER fprg;
@ -91,7 +91,7 @@ typedef struct hlsl_shader_data hlsl_shader_data_t;
struct hlsl_shader_data struct hlsl_shader_data
{ {
d3d_video_t *d3d; d3d_video_t *d3d;
shader_program_data_t prg[RARCH_HLSL_MAX_SHADERS]; struct shader_program_hlsl_data prg[RARCH_HLSL_MAX_SHADERS];
unsigned active_idx; unsigned active_idx;
struct video_shader *cg_shader; struct video_shader *cg_shader;
}; };
@ -103,9 +103,10 @@ void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value)
hlsl_data->prg[hlsl_data->active_idx].mvp_val = rotation_value; hlsl_data->prg[hlsl_data->active_idx].mvp_val = rotation_value;
} }
static void hlsl_uniform_set_parameter(void *data, shader_program_data_t *shader_data, void *uniform_data) static void hlsl_uniform_set_parameter(void *data, void *_shader_data, void *uniform_data)
{ {
struct uniform_info *param = (struct uniform_info*)data; struct uniform_info *param = (struct uniform_info*)data;
struct shader_program_hlsl_data *shader_data = (struct shader_program_hlsl_data*)_shader_data;
if (!param || !param->enabled) if (!param || !param->enabled)
return; return;
@ -199,7 +200,7 @@ static bool hlsl_compile_program(
{ {
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data; hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
d3d_video_t *d3d = (d3d_video_t*)hlsl->d3d; d3d_video_t *d3d = (d3d_video_t*)hlsl->d3d;
shader_program_data_t *program = (shader_program_data_t*)program_data; struct shader_program_hlsl_data *program = (struct shader_program_hlsl_data*)program_data;
LPDIRECT3DDEVICE d3d_device_ptr = (LPDIRECT3DDEVICE)d3d->dev; LPDIRECT3DDEVICE d3d_device_ptr = (LPDIRECT3DDEVICE)d3d->dev;
HRESULT ret, ret_fp, ret_vp; HRESULT ret, ret_fp, ret_vp;
ID3DXBuffer *listing_f = NULL; ID3DXBuffer *listing_f = NULL;