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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-05-17 20:31:16 +02:00
parent 70074010e0
commit 6c392d3863
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/drivers_renderchain/d3d9_cg_renderchain.c
View File

@ -868,7 +868,7 @@ static void d3d9_cg_renderchain_calc_and_set_shader_mvp(
d3d9_cg_set_param_matrix(data, NULL, "modelViewProj", (const void*)&matrix);
}
static void cg_d3d9_renderchain_set_vertices(
static void d3d9_cg_renderchain_set_vertices(
const video_frame_info_t *video_info,
d3d9_renderchain_t *chain,
struct shader_pass *pass,
@ -963,7 +963,7 @@ static void cg_d3d9_renderchain_set_vertices(
vp_width, vp_height);
}
static void cg_d3d9_renderchain_set_params(
static void d3d9_cg_renderchain_set_params(
d3d9_renderchain_t *chain,
LPDIRECT3DDEVICE9 dev,
struct shader_pass *pass,
@ -987,7 +987,7 @@ static void cg_d3d9_renderchain_set_params(
}
}
static void cg_d3d9_renderchain_render_pass(
static void d3d9_cg_renderchain_render_pass(
d3d9_renderchain_t *chain,
struct shader_pass *pass,
state_tracker_t *tracker,
@ -1048,7 +1048,7 @@ static void cg_d3d9_renderchain_render_pass(
d3d9_cg_renderchain_bind_pass(chain, chain->dev, pass, pass_index);
if (tracker)
cg_d3d9_renderchain_set_params(chain, chain->dev, pass, tracker, pass_index);
d3d9_cg_renderchain_set_params(chain, chain->dev, pass, tracker, pass_index);
d3d9_draw_primitive(chain->dev, D3DPT_TRIANGLESTRIP, 0, 2);
@ -1129,13 +1129,13 @@ static bool d3d9_cg_renderchain_render(
d3d9_set_viewports(chain->dev, &viewport);
cg_d3d9_renderchain_set_vertices(video_info,
d3d9_cg_renderchain_set_vertices(video_info,
chain, from_pass,
current_width, current_height,
out_width, out_height,
out_width, out_height, 0);
cg_d3d9_renderchain_render_pass(chain,
d3d9_cg_renderchain_render_pass(chain,
from_pass, tracker,
i + 1);
@ -1156,7 +1156,7 @@ static bool d3d9_cg_renderchain_render(
d3d9_set_viewports(chain->dev, chain->final_viewport);
cg_d3d9_renderchain_set_vertices(video_info,
d3d9_cg_renderchain_set_vertices(video_info,
chain, last_pass,
current_width, current_height,
out_width, out_height,
@ -1164,7 +1164,7 @@ static bool d3d9_cg_renderchain_render(
chain->final_viewport->Height,
rotation);
cg_d3d9_renderchain_render_pass(chain,
d3d9_cg_renderchain_render_pass(chain,
last_pass,
tracker,
chain->passes->count);

71
gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
View File

@ -119,20 +119,6 @@ static void hlsl_use(hlsl_shader_data_t *hlsl,
d3d9_set_pixel_shader(d3dr, program->fprg);
}
static bool hlsl_set_mvp(hlsl_shader_data_t *hlsl,
d3d9_video_t *d3d,
LPDIRECT3DDEVICE9 d3dr,
const D3DMATRIX *mat)
{
struct shader_program_hlsl_data *program = &hlsl->prg[hlsl->active_idx];
if (!program)
return false;
d3d9_hlsl_set_param_matrix(program->v_ctable, d3dr, "modelViewProj", &program->mvp_val);
return true;
}
static bool d3d9_hlsl_load_program(
hlsl_shader_data_t *hlsl,
unsigned idx,
@ -565,6 +551,8 @@ static void d3d9_hlsl_renderchain_calc_and_set_shader_mvp(
unsigned rotation)
{
struct d3d_matrix proj, ortho, rot, matrix;
hlsl_shader_data_t *hlsl = chain->shader_pipeline;
struct shader_program_hlsl_data *program = &hlsl->prg[hlsl->active_idx];
d3d_matrix_ortho_off_center_lh(&ortho, 0, vp_width, 0, vp_height, 0, 1);
d3d_matrix_identity(&rot);
@ -573,10 +561,9 @@ static void d3d9_hlsl_renderchain_calc_and_set_shader_mvp(
d3d_matrix_multiply(&proj, &ortho, &rot);
d3d_matrix_transpose(&matrix, &proj);
if (chain->shader_pipeline)
hlsl_set_mvp(chain->shader_pipeline, d3d,
chain->chain.dev,
(const D3DMATRIX*)&matrix);
if (program)
d3d9_hlsl_set_param_matrix(program->v_ctable,
chain->chain.dev, "modelViewProj", &program->mvp_val);
}
@ -819,6 +806,32 @@ static void hlsl_d3d9_renderchain_set_final_viewport(
d3d9_recompute_pass_sizes(chain->dev, chain, d3d);
}
#if 0
static void d3d9_hlsl_renderchain_set_params(
d3d9_renderchain_t *chain,
LPDIRECT3DDEVICE9 dev,
struct shader_pass *pass,
state_tracker_t *tracker,
unsigned pass_index)
{
unsigned i;
/* Set state parameters. */
/* Only query uniforms in first pass. */
static struct state_tracker_uniform tracker_info[GFX_MAX_VARIABLES];
static unsigned cnt = 0;
if (pass_index == 1)
cnt = state_tracker_get_uniform(tracker, tracker_info,
GFX_MAX_VARIABLES, chain->frame_count);
for (i = 0; i < cnt; i++)
{
d3d9_hlsl_set_param_2f(pass->fprg, dev, tracker_info[i].id, &tracker_info[i].value);
d3d9_hlsl_set_param_2f(pass->vprg, dev, tracker_info[i].id, &tracker_info[i].value);
}
}
#endif
static void hlsl_d3d9_renderchain_render_pass(
hlsl_d3d9_renderchain_t *chain,
struct shader_pass *pass,
@ -846,17 +859,17 @@ static void hlsl_d3d9_renderchain_render_pass(
#if 0
/* Set orig texture. */
d3d9_cg_renderchain_bind_orig(chain, pass);
d3d9_hlsl_renderchain_bind_orig(chain, chain->dev, pass);
/* Set prev textures. */
d3d9_cg_renderchain_bind_prev(chain, pass);
d3d9_hlsl_renderchain_bind_prev(chain, chain->dev, pass);
/* Set lookup textures */
for (i = 0; i < chain->chain.luts->count; i++)
for (i = 0; i < chain->luts->count; i++)
{
CGparameter vparam;
CGparameter fparam = cgGetNamedParameter(
pass->fPrg, chain->chain.luts->data[i].id);
CGparameter fparam = d3d9_hlsl_get_constant_by_name(
pass->fprg, chain->luts->data[i].id);
int bound_index = -1;
if (fparam)
@ -864,24 +877,26 @@ static void hlsl_d3d9_renderchain_render_pass(
unsigned index = cgGetParameterResourceIndex(fparam);
bound_index = index;
d3d9_renderchain_add_lut_internal(&chain->chain, index, i);
d3d9_renderchain_add_lut_internal(chain, index, i);
}
vparam = cgGetNamedParameter(pass->vPrg, chain->chain.luts->data[i].id);
vparam = d3d9_hlsl_get_constant_by_name(pass->vprg,
chain->luts->data[i].id);
if (vparam)
{
unsigned index = cgGetParameterResourceIndex(vparam);
if (index != (unsigned)bound_index)
d3d9_renderchain_add_lut_internal(&chain->chain, index, i);
d3d9_renderchain_add_lut_internal(chain, index, i);
}
}
/* We only bother binding passes which are two indices behind. */
if (pass_index >= 3)
d3d9_cg_renderchain_bind_pass(chain, pass, pass_index);
d3d9_hlsl_renderchain_bind_pass(chain, chain->dev, pass, pass_index);
if (tracker)
hlsl_d3d9_renderchain_set_shader_params(chain, pass, tracker, pass_index);
d3d9_hlsl_renderchain_set_params(chain, chain->dev, pass, tracker, pass_index);
#endif
d3d9_draw_primitive(chain->chain.dev, D3DPT_TRIANGLESTRIP, 0, 2);