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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-12-10 20:05:00 +01:00
parent b22e192bc5
commit 800b62e458
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/cbs/menu_cbs_get_value.c
View File

@ -284,22 +284,20 @@ static void menu_action_setting_disp_set_label_shader_preset_parameter(
{ {
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
const struct video_shader_parameter *param = NULL; const struct video_shader_parameter *param = NULL;
struct video_shader *shader = NULL;
#endif #endif
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return;
(void)menu;
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
strlcpy(s2, path, len2); strlcpy(s2, path, len2);
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (!menu->shader) menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
&shader);
if (!shader)
return; return;
param = &menu->shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0]; param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
if (!param) if (!param)
return; return;
@ -320,9 +318,9 @@ static void menu_action_setting_disp_set_label_shader_scale_pass(
{ {
unsigned pass = 0; unsigned pass = 0;
unsigned scale_value = 0; unsigned scale_value = 0;
menu_handle_t *menu = menu_driver_get_ptr(); #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (!menu) struct video_shader *shader = NULL;
return; #endif
*s = '\0'; *s = '\0';
*w = 19; *w = 19;
@ -330,14 +328,15 @@ static void menu_action_setting_disp_set_label_shader_scale_pass(
(void)pass; (void)pass;
(void)scale_value; (void)scale_value;
(void)menu;
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
if (!menu->shader) menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
&shader);
if (!shader)
return; return;
pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0); pass = (type - MENU_SETTINGS_SHADER_PASS_SCALE_0);
scale_value = menu->shader->pass[pass].fbo.scale_x; scale_value = shader->pass[pass].fbo.scale_x;
if (!scale_value) if (!scale_value)
strlcpy(s, menu_hash_to_str(MENU_VALUE_DONT_CARE), len); strlcpy(s, menu_hash_to_str(MENU_VALUE_DONT_CARE), len);