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

Move Shader Options to Content Settings

Browse Source
This commit is contained in:
twinaphex 2015-06-24 07:38:45 +02:00
parent 961cbdc8d5
commit 3d54e77cea
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/menu_displaylist.c
View File

@ -1486,6 +1486,12 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
menu_hash_to_str(MENU_LABEL_VALUE_DISK_OPTIONS), menu_hash_to_str(MENU_LABEL_VALUE_DISK_OPTIONS),
menu_hash_to_str(MENU_LABEL_DISK_OPTIONS), menu_hash_to_str(MENU_LABEL_DISK_OPTIONS),
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_SHADER_MANAGER
menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),
menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
MENU_SETTING_ACTION, 0, 0);
#endif
} }
else else
menu_list_push(info->list, menu_list_push(info->list,

11
menu/menu_setting.c
View File

@ -3460,13 +3460,6 @@ static bool setting_append_list_main_menu_options(
parent_group); parent_group);
} }
CONFIG_ACTION(
menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS),
group_info.name,
subgroup_info.name,
parent_group);
if (mask & SL_FLAG_MAIN_MENU_SETTINGS) if (mask & SL_FLAG_MAIN_MENU_SETTINGS)
{ {
CONFIG_ACTION( CONFIG_ACTION(
@ -4754,6 +4747,7 @@ static bool setting_append_list_video_options(
return true; return true;
} }
#if 0
static bool setting_append_list_video_shader_options( static bool setting_append_list_video_shader_options(
rarch_setting_t **list, rarch_setting_t **list,
rarch_setting_info_t *list_info, rarch_setting_info_t *list_info,
@ -4864,6 +4858,7 @@ static bool setting_append_list_video_shader_options(
return true; return true;
} }
#endif
static bool setting_append_list_font_options( static bool setting_append_list_font_options(
rarch_setting_t **list, rarch_setting_t **list,
@ -7137,8 +7132,10 @@ rarch_setting_t *menu_setting_new(unsigned mask)
if (!setting_append_list_video_options(&list, list_info, root)) if (!setting_append_list_video_options(&list, list_info, root))
goto error; goto error;
#if 0
if (!setting_append_list_video_shader_options(&list, list_info, root)) if (!setting_append_list_video_shader_options(&list, list_info, root))
goto error; goto error;
#endif
} }
if (mask & SL_FLAG_AUDIO_OPTIONS) if (mask & SL_FLAG_AUDIO_OPTIONS)