mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start getting HLSL compiling for PC

Browse Source
This commit is contained in:
twinaphex 2018-01-06 20:48:17 +01:00
parent ef05fd8a78
commit 942fd7102d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -42,7 +42,7 @@ typedef struct hlsl_d3d9_renderchain
} hlsl_d3d9_renderchain_t;
/* TODO/FIXME - this forward declaration should not be necesary */
void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value);
void hlsl_set_proj_matrix(void *data, void *matrix_data);
static void hlsl_d3d9_renderchain_set_mvp(
void *chain_data,
@ -50,14 +50,21 @@ static void hlsl_d3d9_renderchain_set_mvp(
unsigned vp_height, unsigned rotation)
{
video_shader_ctx_mvp_t mvp;
D3DMATRIX proj, ortho, rot, tmp;
d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
hlsl_set_proj_matrix((void*)&d3d->shader,
XMMatrixRotationZ(rotation * (M_PI / 2.0)));
d3d_matrix_ortho_off_center_lh(&ortho, 0, vp_width, 0, vp_height, 0, 1);
d3d_matrix_identity(&rot);
d3d_matrix_rotation_z(&rot, rotation * (M_PI / 2.0));
d3d_matrix_multiply(&proj, &ortho, &rot);
d3d_matrix_transpose(&tmp, &proj);
hlsl_set_proj_matrix((void*)&d3d->shader, &rot);
mvp.data = d3d;
mvp.matrix = NULL;
mvp.matrix = &rot;
video_driver_set_mvp(&mvp);
}

13
gfx/drivers_shader/shader_hlsl.c
View File

@ -54,7 +54,7 @@ struct shader_program_hlsl_data
LPD3DXCONSTANTTABLE v_ctable;
LPD3DXCONSTANTTABLE f_ctable;
XMMATRIX mvp_val; /* TODO: Move to D3DXMATRIX here */
D3DXMATRIX mvp_val;
};
typedef struct hlsl_shader_data hlsl_shader_data_t;
@ -153,11 +153,12 @@ struct hlsl_shader_data
struct video_shader *cg_shader;
};
void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value)
void hlsl_set_proj_matrix(void *data, void *matrix_data)
{
hlsl_shader_data_t *hlsl = (hlsl_shader_data_t*)data;
if (hlsl)
hlsl->prg[hlsl->active_idx].mvp_val = rotation_value;
const D3DMATRIX *matrix = (const D3DMATRIX*)matrix_data;
if (hlsl && matrix)
hlsl->prg[hlsl->active_idx].mvp_val = *matrix;
}
static void hlsl_set_uniform_parameter(
@ -351,7 +352,7 @@ static void hlsl_set_program_attributes(hlsl_shader_data_t *hlsl, unsigned i)
hlsl->prg[i].frame_cnt_v = get_constant_by_name(NULL, "$IN.frame_count", hlsl->prg[i].v_ctable);
hlsl->prg[i].frame_dir_v = get_constant_by_name(NULL, "$IN.frame_direction", hlsl->prg[i].v_ctable);
hlsl->prg[i].mvp = get_constant_by_name(NULL, "$modelViewProj", hlsl->prg[i].v_ctable);
hlsl->prg[i].mvp_val = XMMatrixIdentity();
d3d_matrix_identity(&hlsl->prg[i].mvp_val);
}
static bool hlsl_load_shader(hlsl_shader_data_t *hlsl,
@ -599,7 +600,7 @@ static bool hlsl_set_mvp(void *data, void *shader_data, const void *mat_data)
{
ID3DXConstantTable_SetMatrix(hlsl_data->prg[hlsl_data->active_idx].v_ctable, d3dr,
hlsl_data->prg[hlsl_data->active_idx].mvp,
(D3DXMATRIX*)&hlsl_data->prg[hlsl_data->active_idx].mvp_val);
&hlsl_data->prg[hlsl_data->active_idx].mvp_val);
return true;
}
return false;