mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 06:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calls to menu_entries_get_menu_stack_ptr and

Browse Source 
menu_entries_get_selection_buf
This commit is contained in:
twinaphex 2021-03-07 06:26:51 +01:00
parent 7b6a01056e
commit b65d4e483e
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
retroarch.c
View File

@ -1855,7 +1855,8 @@ static int generic_menu_iterate(
break; break;
case ITERATE_TYPE_INFO: case ITERATE_TYPE_INFO:
{ {
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); menu_list_t *menu_list = menu_st->entries.list;
file_list_t *selection_buf = menu_list ? MENU_LIST_GET_SELECTION(menu_list, (unsigned)0) : NULL;
size_t selection = menu_st->selection_ptr; size_t selection = menu_st->selection_ptr;
menu_file_list_cbs_t *cbs = selection_buf ? menu_file_list_cbs_t *cbs = selection_buf ?
(menu_file_list_cbs_t*) (menu_file_list_cbs_t*)
@ -2115,10 +2116,13 @@ static int generic_menu_iterate(
int generic_menu_entry_action( int generic_menu_entry_action(
void *userdata, menu_entry_t *entry, size_t i, enum menu_action action) void *userdata, menu_entry_t *entry, size_t i, enum menu_action action)
{ {
int ret = 0; int ret = 0;
struct rarch_state *p_rarch = &rarch_st; struct rarch_state *p_rarch = &rarch_st;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); struct menu_state *menu_st = &p_rarch->menu_driver_state;
menu_file_list_cbs_t *cbs = selection_buf ? menu_list_t *menu_list = menu_st->entries.list;
;
file_list_t *selection_buf = menu_list ? MENU_LIST_GET_SELECTION(menu_list, (unsigned)0) : NULL;
menu_file_list_cbs_t *cbs = selection_buf ?
(menu_file_list_cbs_t*)selection_buf->list[i].actiondata : NULL; (menu_file_list_cbs_t*)selection_buf->list[i].actiondata : NULL;
switch (action) switch (action)
@ -2193,7 +2197,10 @@ int generic_menu_entry_action(
if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL)) if (menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL))
{ {
bool refresh = false; bool refresh = false;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); struct menu_state
*menu_st = &p_rarch->menu_driver_state;
menu_list_t *menu_list = menu_st->entries.list;
file_list_t *menu_stack = menu_list ? MENU_LIST_GET(menu_list, (unsigned)0) : NULL;
cbs->action_refresh(selection_buf, menu_stack); cbs->action_refresh(selection_buf, menu_stack);
menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh); menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
@ -4089,11 +4096,18 @@ static enum menu_driver_id_type menu_driver_set_id(struct rarch_state *p_rarch)
return MENU_DRIVER_ID_UNKNOWN; return MENU_DRIVER_ID_UNKNOWN;
} }
static bool generic_menu_init_list(void *data) static bool generic_menu_init_list(struct menu_state *menu_st)
{ {
menu_displaylist_info_t info; menu_displaylist_info_t info;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); menu_list_t *menu_list = menu_st->entries.list;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); file_list_t *menu_stack = NULL;
file_list_t *selection_buf = NULL;
if (menu_list)
{
menu_stack = MENU_LIST_GET(menu_list, (unsigned)0);
selection_buf = MENU_LIST_GET_SELECTION(menu_list, (unsigned)0);
}
menu_displaylist_info_init(&info); menu_displaylist_info_init(&info);
@ -4155,7 +4169,7 @@ static bool menu_driver_init_internal(
return false; return false;
} }
else else
generic_menu_init_list(p_rarch->menu_driver_data); generic_menu_init_list(&p_rarch->menu_driver_state);
return true; return true;
} }
@ -9796,8 +9810,11 @@ static void menu_input_search_cb(void *userdata, const char *str)
* first matching entry */ * first matching entry */
else else
{ {
size_t idx = 0; size_t idx = 0;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); struct rarch_state *p_rarch = &rarch_st;
struct menu_state *menu_st = &p_rarch->menu_driver_state;
menu_list_t *menu_list = menu_st->entries.list;
file_list_t *selection_buf = menu_list ? MENU_LIST_GET_SELECTION(menu_list, (unsigned)0) : NULL;
if (!selection_buf) if (!selection_buf)
goto end; goto end;
@ -24548,10 +24565,11 @@ static int menu_input_post_iterate(
{ {
menu_input_t *menu_input = &p_rarch->menu_input_state; menu_input_t *menu_input = &p_rarch->menu_input_state;
menu_entry_t entry; menu_entry_t entry;
struct menu_state *menu_st = &p_rarch->menu_driver_state; struct menu_state *menu_st = &p_rarch->menu_driver_state;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); menu_list_t *menu_list = menu_st->entries.list;
size_t selection = menu_st->selection_ptr; file_list_t *selection_buf = menu_list ? MENU_LIST_GET_SELECTION(menu_list, (unsigned)0) : NULL;
menu_file_list_cbs_t *cbs = selection_buf ? size_t selection = menu_st->selection_ptr;
menu_file_list_cbs_t *cbs = selection_buf ?
(menu_file_list_cbs_t*)selection_buf->list[selection].actiondata (menu_file_list_cbs_t*)selection_buf->list[selection].actiondata
: NULL; : NULL;