mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-06 10:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Displaylist - Get rid of global

Browse Source
This commit is contained in:
twinaphex 2019-12-23 06:34:58 +01:00
parent 9988bae6f4
commit 2512365012
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu_displaylist.c
View File

@ -105,9 +105,6 @@ static char new_lbl_entry[4096] = {0};
static char new_entry[4096] = {0}; static char new_entry[4096] = {0};
static enum msg_hash_enums new_type = MSG_UNKNOWN; static enum msg_hash_enums new_type = MSG_UNKNOWN;
/* TODO/FIXME - global state */
static unsigned current_entry_type = 0;
#define menu_displaylist_parse_settings_enum(list, label, parse_type, add_empty_entry) menu_displaylist_parse_settings_internal_enum(list, parse_type, add_empty_entry, menu_setting_find_enum(label), label, true) #define menu_displaylist_parse_settings_enum(list, label, parse_type, add_empty_entry) menu_displaylist_parse_settings_internal_enum(list, parse_type, add_empty_entry, menu_setting_find_enum(label), label, true)
#define menu_displaylist_parse_settings(list, label, parse_type, add_empty_entry, entry_type) menu_displaylist_parse_settings_internal_enum(list, parse_type, add_empty_entry, menu_setting_find(label), entry_type, false) #define menu_displaylist_parse_settings(list, label, parse_type, add_empty_entry, entry_type) menu_displaylist_parse_settings_internal_enum(list, parse_type, add_empty_entry, menu_setting_find(label), entry_type, false)
@ -7051,7 +7048,7 @@ static unsigned menu_displaylist_build_shader_parameter(
val_d, val_d,
MENU_ENUM_LABEL_NO_ITEMS, MENU_ENUM_LABEL_NO_ITEMS,
setting_type, setting_type,
i, current_entry_type)) i, entry_type))
count++; count++;
current_value += param->step; current_value += param->step;
@ -7079,8 +7076,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (menu_driver_push_list(&disp_list)) if (menu_driver_push_list(&disp_list))
return true; return true;
current_entry_type = info->type;
switch (type) switch (type)
{ {
#ifdef HAVE_CDROM #ifdef HAVE_CDROM
@ -8558,7 +8553,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_build_shader_parameter( count = menu_displaylist_build_shader_parameter(
info, info->list, current_entry_type, info, info->list, info->type,
MENU_SETTINGS_SHADER_PARAMETER_0, MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PARAM); MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PARAM);
@ -8569,7 +8564,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_build_shader_parameter( count = menu_displaylist_build_shader_parameter(
info, info->list, current_entry_type, info, info->list, info->type,
MENU_SETTINGS_SHADER_PRESET_PARAMETER_0, MENU_SETTINGS_SHADER_PRESET_PARAMETER_0,
MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PRESET_PARAM); MENU_SETTING_DROPDOWN_ITEM_VIDEO_SHADER_PRESET_PARAM);
info->need_refresh = true; info->need_refresh = true;