ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename info variable to state_info to avoid declaration shadowing

This commit is contained in:
twinaphex 2014-10-22 07:20:20 +02:00
parent ad46676689
commit 8e043ce9a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/shader/shader_glsl.c
View File

@ -1040,18 +1040,18 @@ static void gl_glsl_set_params(void *data, unsigned width, unsigned height,
/* Set state parameters. */ /* Set state parameters. */
if (gl_state_tracker) if (gl_state_tracker)
{ {
static struct state_tracker_uniform info[GFX_MAX_VARIABLES]; static struct state_tracker_uniform state_info[GFX_MAX_VARIABLES];
static unsigned cnt = 0; static unsigned cnt = 0;
if (glsl_active_index == 1) if (glsl_active_index == 1)
cnt = state_get_uniform(gl_state_tracker, info, cnt = state_get_uniform(gl_state_tracker, state_info,
GFX_MAX_VARIABLES, frame_count); GFX_MAX_VARIABLES, frame_count);
for (i = 0; i < cnt; i++) for (i = 0; i < cnt; i++)
{ {
int location = glGetUniformLocation(gl_program[glsl_active_index], int location = glGetUniformLocation(gl_program[glsl_active_index],
info[i].id); state_info[i].id);
glUniform1f(location, info[i].value); glUniform1f(location, state_info[i].value);
} }
} }
} }