mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-18 13:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gl_common.c) Fix declaration shadows a variable in global scope warning

Browse Source
This commit is contained in:
Twinaphex 2014-10-14 18:30:22 +02:00
parent 4fb4ad8a1e
commit 40f97cde13
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/menu/menu_entries.c
View File

@ -427,7 +427,6 @@ static int push_list(menu_handle_t *menu,
file_list_clear(list);
if (g_extern.system.core_options)
{
size_t i;
size_t opts = core_option_size(g_extern.system.core_options);
for (i = 0; i < opts; i++)
file_list_push(list,

6
gfx/gl_common.c
View File

@ -48,7 +48,7 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
}
bool gl_load_luts(const struct gfx_shader *generic_shader,
GLuint *lut_textures)
GLuint *textures_lut)
{
unsigned i;
unsigned num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES);
@ -59,7 +59,7 @@ bool gl_load_luts(const struct gfx_shader *generic_shader,
/* Original shader_glsl.c code only generated one
* texture handle. I assume it was a bug, but if not,
* replace num_luts with 1 when GLSL is used. */
glGenTextures(num_luts, lut_textures);
glGenTextures(num_luts, textures_lut);
for (i = 0; i < num_luts; i++)
{
struct texture_image img = {0};
@ -73,7 +73,7 @@ bool gl_load_luts(const struct gfx_shader *generic_shader,
return false;
}
gl_load_texture_data(lut_textures[i], &img,
gl_load_texture_data(textures_lut[i], &img,
driver.video->wrap_type_to_enum(generic_shader->lut[i].wrap),
generic_shader->lut[i].filter != RARCH_FILTER_NEAREST,
generic_shader->lut[i].mipmap);