mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update menu_driver_render

Browse Source
This commit is contained in:
twinaphex 2019-08-09 12:09:01 +02:00
parent 82168c0925
commit 6482a81ef5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/null.c
View File

@ -45,9 +45,9 @@ static void null_toggle(void *userdata, bool menu_on)
g_menu_on = menu_on;
}
static int null_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_action action)
static int null_menu_iterate(void *data, void *userdata, enum menu_action action)
{
(void)menu;
(void)data;
(void)userdata;
(void)action;

9
menu/menu_driver.c
View File

@ -2037,13 +2037,14 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited,
BIT64_SET(menu_driver_data->state, MENU_STATE_RENDER_FRAMEBUFFER);
if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_FRAMEBUFFER))
menu_display_framebuf_dirty = true;
menu_display_set_framebuffer_dirty_flag();
if (BIT64_GET(menu_driver_data->state, MENU_STATE_RENDER_MESSAGEBOX)
&& !string_is_empty(menu_driver_data->menu_state_msg))
{
if (menu_driver_data->driver_ctx->render_messagebox)
menu_driver_data->driver_ctx->render_messagebox(menu_userdata,
menu_driver_data->driver_ctx->render_messagebox(
menu_driver_data->userdata,
menu_driver_data->menu_state_msg);
if (ui_companion_is_on_foreground())
@ -2057,7 +2058,8 @@ bool menu_driver_render(bool is_idle, bool rarch_is_inited,
if (BIT64_GET(menu_driver_data->state, MENU_STATE_BLIT))
{
if (menu_driver_data->driver_ctx->render)
menu_driver_data->driver_ctx->render(menu_userdata, is_idle);
menu_driver_data->driver_ctx->render(
menu_driver_data->userdata, is_idle);
}
if (menu_driver_alive && !is_idle)
@ -2208,6 +2210,7 @@ static bool menu_driver_init_internal(bool video_is_threaded)
{
menu_driver_data = (menu_handle_t*)
menu_driver_ctx->init(&menu_userdata, video_is_threaded);
menu_driver_data->userdata = menu_userdata;
menu_driver_data->driver_ctx = menu_driver_ctx;
}

1
menu/menu_driver.h
View File

@ -351,6 +351,7 @@ typedef struct
unsigned unsigned_var;
} scratchpad;
const menu_ctx_driver_t *driver_ctx;
void *userdata;
} menu_handle_t;
struct menu_display_ctx_draw