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

Cleanups

This commit is contained in:
twinaphex 2015-10-20 01:54:04 +02:00
parent e89708a082
commit 3602d703cc
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
menu/menu_displaylist.c
View File

@ -2195,6 +2195,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr();
#ifdef HAVE_SHADER_MANAGER
struct video_shader *shader = video_shader_driver_get_current_shader();
#endif
switch (type) switch (type)
{ {
@ -2454,25 +2457,20 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_SHADER_PARAMETERS: case DISPLAYLIST_SHADER_PARAMETERS:
case DISPLAYLIST_SHADER_PARAMETERS_PRESET: case DISPLAYLIST_SHADER_PARAMETERS_PRESET:
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
if (shader)
ret = deferred_push_video_shader_parameters_common(info, shader,
(type == DISPLAYLIST_SHADER_PARAMETERS)
? MENU_SETTINGS_SHADER_PARAMETER_0 : MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
);
else
{ {
struct video_shader *shader = video_shader_driver_get_current_shader(); menu_entries_push(info->list,
if (!shader) menu_hash_to_str(MENU_LABEL_VALUE_NO_SHADER_PARAMETERS),
{ "", 0, 0, 0);
menu_entries_push(info->list, ret = 0;
menu_hash_to_str(MENU_LABEL_VALUE_NO_SHADER_PARAMETERS),
"", 0, 0, 0);
ret = 0;
}
else
{
ret = deferred_push_video_shader_parameters_common(info, shader,
(type == DISPLAYLIST_SHADER_PARAMETERS)
? MENU_SETTINGS_SHADER_PARAMETER_0 : MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
);
}
need_push = true;
} }
need_push = true;
#endif #endif
break; break;
case DISPLAYLIST_PERFCOUNTERS_CORE: case DISPLAYLIST_PERFCOUNTERS_CORE: