From 0ed4b97bbcc57368ae9bec8eb12f06e33d380117 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 13 Aug 2017 18:05:51 +0200 Subject: [PATCH] Revert "Don't hide 'Resolution' setting behind compile-time ifdefs anymore" This reverts commit 365cfd22ee2d26f1aed2566944a545ef09ac03ea. --- gfx/video_driver.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 02125f91e1..bc6941349e 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1431,7 +1431,6 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, void *group_data, void *subgroup_data, const char *parent_group) { #ifdef HAVE_MENU - bool has_video_output = false; rarch_setting_t **list = (rarch_setting_t**)list_data; rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_data; rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data; @@ -1444,26 +1443,15 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, (void)subgroup_info; (void)global; - has_video_output = video_driver_poke->get_video_output_next || - current_video_context.get_video_output_next; - if (has_video_output) - has_video_output = video_driver_poke->get_video_output_prev || - current_video_context.get_video_output_prev; - if (has_video_output) - has_video_output = video_driver_poke->get_video_output_size || - current_video_context.get_video_output_size; - - if (has_video_output) - { - CONFIG_ACTION( - list, list_info, - MENU_ENUM_LABEL_SCREEN_RESOLUTION, - MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, - group_info, - subgroup_info, - parent_group); - } - +#if defined(GEKKO) || defined(__CELLOS_LV2__) + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_SCREEN_RESOLUTION, + MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, + group_info, + subgroup_info, + parent_group); +#endif #if defined(__CELLOS_LV2__) CONFIG_BOOL( list, list_info,