mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

shader left / right fixes and cleanup

Browse Source
This commit is contained in:
radius 2018-03-17 14:55:15 -05:00
parent 9721c7c4be
commit 1a4db72e82
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
menu/cbs/menu_cbs_left.c
View File

@ -70,14 +70,13 @@ static int shader_action_parameter_left(unsigned type, const char *label, bool w
video_shader_driver_get_current_shader(&shader_info); video_shader_driver_get_current_shader(&shader_info);
param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
if (!param_prev) param_menu = shader ? &shader->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0] : NULL;
if (!param_prev || !param_menu)
return menu_cbs_exit(); return menu_cbs_exit();
ret = generic_shader_action_parameter_left(param_prev, type, label, wraparound); ret = generic_shader_action_parameter_left(param_prev, type, label, wraparound);
param_menu = shader ? &shader->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0] : NULL;
if (!param_menu)
return menu_cbs_exit();
param_menu->current = param_prev->current; param_menu->current = param_prev->current;
return ret; return ret;

13
menu/cbs/menu_cbs_right.c
View File

@ -64,23 +64,22 @@ static int generic_shader_action_parameter_right(struct video_shader_parameter *
int shader_action_parameter_right(unsigned type, const char *label, bool wraparound) int shader_action_parameter_right(unsigned type, const char *label, bool wraparound)
{ {
video_shader_ctx_t shader_info; video_shader_ctx_t shader_info;
struct video_shader_parameter *param_prev = NULL; struct video_shader *shader = menu_shader_get();
struct video_shader_parameter *param_menu = NULL; struct video_shader_parameter *param_menu = NULL;
struct video_shader_parameter *param_prev = NULL;
int ret = 0; int ret = 0;
video_shader_driver_get_current_shader(&shader_info); video_shader_driver_get_current_shader(&shader_info);
param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0]; param_prev = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
param_menu = shader ? &shader->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0] : NULL;
if (!param_prev) if (!param_prev || !param_menu)
return menu_cbs_exit(); return menu_cbs_exit();
ret = generic_shader_action_parameter_right(param_prev, type, label, wraparound); ret = generic_shader_action_parameter_right(param_prev, type, label, wraparound);
param_menu = &shader_info.data->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0];
if (!param_menu)
return menu_cbs_exit();
param_menu->current = param_prev->current; param_menu->current = param_prev->current;
return ret; return ret;