mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_shader.c) Fix 'declaration(s) shadows variables in local/global scope' warnings

Browse Source
This commit is contained in:
Twinaphex 2014-10-14 18:46:40 +02:00
parent 8a6a3606b7
commit 4ff31b9357
1 changed files with 10 additions and 10 deletions

20
frontend/menu/menu_shader.c

@ -147,22 +147,22 @@ void menu_shader_manager_set_preset(struct gfx_shader *shader,
} }
} }
void menu_shader_manager_get_str(struct gfx_shader *shader, void menu_shader_manager_get_str(struct gfx_shader *program,
char *type_str, size_t type_str_size, const char *menu_label, char *type_str, size_t type_str_size, const char *menu_label,
const char *label, unsigned type) const char *label, unsigned type)
{ {
*type_str = '\0'; *type_str = '\0';
if (!strcmp(label, "video_shader_num_passes")) if (!strcmp(label, "video_shader_num_passes"))
snprintf(type_str, type_str_size, "%u", shader->passes); snprintf(type_str, type_str_size, "%u", program->passes);
else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
&& type <= MENU_SETTINGS_SHADER_PARAMETER_LAST) && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
{ {
/* menu->parameter_shader here. */ /* menu->parameter_shader here. */
if (shader) if (program)
{ {
const struct gfx_shader_parameter *param = const struct gfx_shader_parameter *param =
(const struct gfx_shader_parameter*)&shader->parameters (const struct gfx_shader_parameter*)&program->parameters
[type - MENU_SETTINGS_SHADER_PARAMETER_0]; [type - MENU_SETTINGS_SHADER_PARAMETER_0];
snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]", snprintf(type_str, type_str_size, "%.2f [%.2f %.2f]",
param->current, param->minimum, param->maximum); param->current, param->minimum, param->maximum);
@ -174,9 +174,9 @@ void menu_shader_manager_get_str(struct gfx_shader *shader,
else if (!strcmp(label, "video_shader_pass")) else if (!strcmp(label, "video_shader_pass"))
{ {
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_0); unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_0);
if (*shader->pass[pass].source.path) if (*program->pass[pass].source.path)
fill_pathname_base(type_str, fill_pathname_base(type_str,
shader->pass[pass].source.path, type_str_size); program->pass[pass].source.path, type_str_size);
else else
strlcpy(type_str, "N/A", type_str_size); strlcpy(type_str, "N/A", type_str_size);
} }
@ -189,17 +189,17 @@ void menu_shader_manager_get_str(struct gfx_shader *shader,
"Nearest" "Nearest"
}; };
strlcpy(type_str, modes[shader->pass[pass].filter], strlcpy(type_str, modes[program->pass[pass].filter],
type_str_size); type_str_size);
} }
else if (!strcmp(label, "video_shader_scale_pass")) else if (!strcmp(label, "video_shader_scale_pass"))
{ {
unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0); unsigned pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0);
unsigned scale = shader->pass[pass].fbo.scale_x; unsigned scale_value = program->pass[pass].fbo.scale_x;
if (!scale) if (!scale)
strlcpy(type_str, "Don't care", type_str_size); strlcpy(type_str, "Don't care", type_str_size);
else else
snprintf(type_str, type_str_size, "%ux", scale); snprintf(type_str, type_str_size, "%ux", scale_value);
} }
} }