mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(HLSL) Further cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-17 19:55:08 +02:00
parent 9adc4d4a2f
commit cc1f503f57
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -46,9 +46,6 @@ struct shader_program_hlsl_data
{
LPDIRECT3DVERTEXSHADER9 vprg;
LPDIRECT3DPIXELSHADER9 fprg;
D3DXHANDLE mvp;
LPD3DXCONSTANTTABLE v_ctable;
LPD3DXCONSTANTTABLE f_ctable;
D3DXMATRIX mvp_val;
@ -96,6 +93,16 @@ static INLINE void d3d9_hlsl_set_param_1f(void *data, void *userdata, const char
d3d9x_constant_table_set_float(prog, (LPDIRECT3DDEVICE9)userdata, (void*)param, *val);
}
static INLINE void d3d9_hlsl_set_param_matrix(void *data, void *userdata,
const char *name, const void *values)
{
LPD3DXCONSTANTTABLE prog = (LPD3DXCONSTANTTABLE)data;
D3DXHANDLE param = d3d9_hlsl_get_constant_by_name(prog, name);
if (param)
d3d9x_constant_table_set_matrix((LPDIRECT3DDEVICE9)userdata, prog,
(void*)param, (D3DMATRIX*)values);
}
static void hlsl_use(hlsl_shader_data_t *hlsl,
LPDIRECT3DDEVICE9 d3dr,
unsigned idx, bool set_active)
@ -119,23 +126,13 @@ static bool hlsl_set_mvp(hlsl_shader_data_t *hlsl,
{
struct shader_program_hlsl_data *program = &hlsl->prg[hlsl->active_idx];
if (!program || !program->mvp)
if (!program)
return false;
d3d9x_constant_table_set_matrix(d3dr, program->v_ctable,
(void*)program->mvp, &program->mvp_val);
d3d9_hlsl_set_param_matrix(program->v_ctable, d3dr, "modelViewProj", &program->mvp_val);
return true;
}
#if 0
void hlsl_set_proj_matrix(hlsl_shader_data_t *hlsl, void *matrix_data)
{
const D3DMATRIX *matrix = (const D3DMATRIX*)matrix_data;
if (hlsl && matrix)
hlsl->prg[hlsl->active_idx].mvp_val = *matrix;
}
#endif
static bool d3d9_hlsl_load_program(
hlsl_shader_data_t *hlsl,
unsigned idx,
@ -203,17 +200,8 @@ static void hlsl_set_program_attributes(hlsl_shader_data_t *hlsl,
unsigned i)
{
struct shader_program_hlsl_data *program = &hlsl->prg[i];
void *fprg = NULL;
void *vprg = NULL;
if (!program)
return;
vprg = program->v_ctable;
if (vprg)
program->mvp = (D3DXHANDLE)d3d9_hlsl_get_constant_by_name(vprg, "modelViewProj");
if (program)
d3d_matrix_identity(&program->mvp_val);
}