From 3d54e77cea445874d2ec0726756a2757d7cfe7ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 24 Jun 2015 07:38:45 +0200 Subject: [PATCH] Move Shader Options to Content Settings --- menu/menu_displaylist.c | 6 ++++++ menu/menu_setting.c | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1b32ccb18e..45fbef90f0 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -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_DISK_OPTIONS), 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 menu_list_push(info->list, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 5dfb3b677f..a8edcdc0db 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3460,13 +3460,6 @@ static bool setting_append_list_main_menu_options( 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) { CONFIG_ACTION( @@ -4754,6 +4747,7 @@ static bool setting_append_list_video_options( return true; } +#if 0 static bool setting_append_list_video_shader_options( rarch_setting_t **list, rarch_setting_info_t *list_info, @@ -4864,6 +4858,7 @@ static bool setting_append_list_video_shader_options( return true; } +#endif static bool setting_append_list_font_options( 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)) goto error; +#if 0 if (!setting_append_list_video_shader_options(&list, list_info, root)) goto error; +#endif } if (mask & SL_FLAG_AUDIO_OPTIONS)