CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 03:10:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Move set_texture call to higher-level iterate function

Browse Source
This commit is contained in:
twinaphex 2015-02-11 19:16:06 +01:00
parent 00cd281a1f
commit 8e42857488
7 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/drivers/glui.c
View File

@ -51,9 +51,6 @@ static int glui_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);

3
menu/drivers/ios.c
View File

@ -48,9 +48,6 @@ static int ios_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);

11
menu/drivers/rgui.c
View File

@ -49,15 +49,10 @@ static int rgui_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);
if (!cbs)
return -1;
if (!cbs->action_iterate)
return -1;
return cbs->action_iterate(label, action);
return -1;
}
static void rgui_copy_glyph(uint8_t *glyph, const uint8_t *buf)

3
menu/drivers/rmenu.c
View File

@ -73,9 +73,6 @@ static int rmenu_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);

3
menu/drivers/rmenu_xui.cpp
View File

@ -67,9 +67,6 @@ static int rmenu_xui_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);

3
menu/drivers/xmb.c
View File

@ -170,9 +170,6 @@ static int xmb_entry_iterate(unsigned action)
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (driver.video_data && driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);

3
menu/menu.c
View File

@ -355,6 +355,9 @@ int menu_iterate(retro_input_t input,
int32_t ret = 0;
unsigned action = menu_input_frame(input, trigger_input);
if (driver.menu_ctx && driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu);
if (driver.menu_ctx && driver.menu_ctx->entry_iterate)
ret = driver.menu_ctx->entry_iterate(action);