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

(Cg) Fix Cg named parameter lookup

Browse Source
This commit is contained in:
twinaphex 2016-04-16 20:32:45 +02:00
parent 0b4ae30f6b
commit 6d7dab2e66
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_shader/shader_gl_cg.c
View File

@ -135,7 +135,7 @@ static void gl_cg_set_uniform_parameter(
prog = cg_data->prg[param->lookup.idx].fprg;
break;
}
location = cgGetNamedParameter(prog, cg_data->shader->lut[param->lookup.idx].id);
location = cgGetNamedParameter(prog, param->lookup.ident);
}
else
{
@ -498,25 +498,27 @@ static void gl_cg_set_params(void *data, void *shader_data,
for (i = 0; i < cg_data->shader->num_parameters; 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, cg_data->shader->parameters[i].id);
pragma_cg_params[1].loc = cgGetNamedParameter(
cg_data->prg[cg_data->active_idx].fprg, cg_data->shader->parameters[i].id);
uniform_params[0].lookup.enable = true;
uniform_params[0].lookup.idx = cg_data->active_idx;
uniform_params[0].lookup.ident = cg_data->shader->parameters[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 = cg_data->shader->parameters[i].current;
uniform_params[1].lookup.enable = true;
uniform_params[1].lookup.idx = cg_data->active_idx;
uniform_params[1].lookup.ident = cg_data->shader->parameters[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 = cg_data->shader->parameters[i].current;
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);
}
/* Set state parameters. */