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

Revert "Don't hide 'Resolution' setting behind compile-time ifdefs anymore" 

This reverts commit 365cfd22ee.
This commit is contained in:
twinaphex 2017-08-13 18:05:51 +02:00
parent f9765a98fb
commit 0ed4b97bbc
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/video_driver.c
View File

@ -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) void *group_data, void *subgroup_data, const char *parent_group)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool has_video_output = false;
rarch_setting_t **list = (rarch_setting_t**)list_data; rarch_setting_t **list = (rarch_setting_t**)list_data;
rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_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; rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data;
@ -1444,17 +1443,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
(void)subgroup_info; (void)subgroup_info;
(void)global; (void)global;
has_video_output = video_driver_poke->get_video_output_next || #if defined(GEKKO) || defined(__CELLOS_LV2__)
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( CONFIG_ACTION(
list, list_info, list, list_info,
MENU_ENUM_LABEL_SCREEN_RESOLUTION, MENU_ENUM_LABEL_SCREEN_RESOLUTION,
@ -1462,8 +1451,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
group_info, group_info,
subgroup_info, subgroup_info,
parent_group); parent_group);
} #endif
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,