From a99dcaa92907fb6a1c1e9e20b4a180d370cd62d0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 16 Apr 2016 20:35:08 +0200 Subject: [PATCH] (Cg) Get rid of pragma_cg_params --- gfx/drivers_shader/shader_gl_cg.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 4f8fba0a56..0e3c45ea3e 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -535,25 +535,27 @@ static void gl_cg_set_params(void *data, void *shader_data, for (i = 0; i < cnt; i++) { unsigned j; - struct uniform_cg_data pragma_cg_params[2]; - - pragma_cg_params[0].loc = cgGetNamedParameter( - cg_data->prg[cg_data->active_idx].vprg, tracker_info[i].id); - pragma_cg_params[1].loc = cgGetNamedParameter( - cg_data->prg[cg_data->active_idx].fprg, tracker_info[i].id); + uniform_params[0].lookup.enable = true; + uniform_params[0].lookup.idx = cg_data->active_idx; + uniform_params[0].lookup.ident = tracker_info[i].id; + uniform_params[0].lookup.type = SHADER_PROGRAM_VERTEX; uniform_params[0].location = 0; uniform_params[0].enabled = true; uniform_params[0].type = UNIFORM_1F; uniform_params[0].result.f.v0 = tracker_info[i].value; + uniform_params[1].lookup.enable = true; + uniform_params[1].lookup.idx = cg_data->active_idx; + uniform_params[1].lookup.ident = tracker_info[i].id; + uniform_params[1].lookup.type = SHADER_PROGRAM_FRAGMENT; uniform_params[1].location = 1; uniform_params[1].enabled = true; uniform_params[1].type = UNIFORM_1F; uniform_params[1].result.f.v0 = tracker_info[i].value; for (j = 0; j < 2; j++) - gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], &pragma_cg_params[j]); + gl_cg_set_uniform_parameter(cg_data, &uniform_params[j], NULL); } } }