mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 08:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add frame function to menu_ctx_driver_t struct

Browse Source
This commit is contained in:
twinaphex 2014-04-01 04:45:00 +02:00
parent aadb940da8
commit a40e942280
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
driver.h
View File

@ -485,6 +485,7 @@ typedef struct menu_ctx_driver
void (*set_texture)(void*, bool); void (*set_texture)(void*, bool);
void (*render_messagebox)(void*, const char*); void (*render_messagebox)(void*, const char*);
void (*render)(void*); void (*render)(void*);
void (*frame)(void*);
void* (*init)(void); void* (*init)(void);
void (*free)(void*); void (*free)(void*);
void (*init_assets)(void*); void (*init_assets)(void*);

1
frontend/menu/disp/lakka.c
View File

@ -716,6 +716,7 @@ const menu_ctx_driver_t menu_ctx_lakka = {
lakka_set_texture, lakka_set_texture,
lakka_render_messagebox, lakka_render_messagebox,
lakka_render, lakka_render,
NULL,
lakka_init, lakka_init,
lakka_free, lakka_free,
lakka_init_assets, lakka_init_assets,

1
frontend/menu/disp/rgui.c
View File

@ -604,6 +604,7 @@ const menu_ctx_driver_t menu_ctx_rgui = {
rgui_set_texture, rgui_set_texture,
rgui_render_messagebox, rgui_render_messagebox,
rgui_render, rgui_render,
NULL,
rgui_init, rgui_init,
rgui_free, rgui_free,
NULL, NULL,

1
frontend/menu/disp/rmenu.c
View File

@ -465,6 +465,7 @@ const menu_ctx_driver_t menu_ctx_rmenu = {
rmenu_set_texture, rmenu_set_texture,
rmenu_render_messagebox, rmenu_render_messagebox,
rmenu_render, rmenu_render,
NULL,
rmenu_init, rmenu_init,
rmenu_free, rmenu_free,
rmenu_init_assets, rmenu_init_assets,

5
frontend/menu/disp/rmenu_xui.cpp
View File

@ -288,9 +288,9 @@ static void xui_render_message(const char *msg)
} }
} }
bool menu_iterate_xui(void) static void rmenu_xui_render(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
D3DVIEWPORT vp_full; D3DVIEWPORT vp_full;
@ -652,6 +652,7 @@ const menu_ctx_driver_t menu_ctx_rmenu_xui = {
NULL, NULL,
rmenu_xui_render_messagebox, rmenu_xui_render_messagebox,
rmenu_xui_render, rmenu_xui_render,
rmenu_xui_frame,
rmenu_xui_init, rmenu_xui_init,
rmenu_xui_free, rmenu_xui_free,
NULL, NULL,

10
xdk/xdk_d3d.cpp
View File

@ -579,10 +579,6 @@ static bool texture_image_render(void *data, struct texture_image *out_img,
#ifdef HAVE_MENU #ifdef HAVE_MENU
#ifdef HAVE_RMENU_XUI
extern bool menu_iterate_xui(void);
#endif
static void d3d_draw_texture(void *data) static void d3d_draw_texture(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
@ -779,10 +775,8 @@ static bool d3d_frame(void *data, const void *frame,
render_pass(d3d, frame, width, height, pitch, d3d->dev_rotation); render_pass(d3d, frame, width, height, pitch, d3d->dev_rotation);
#ifdef HAVE_MENU #ifdef HAVE_MENU
#ifdef HAVE_RMENU_XUI if (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame)
if (g_extern.lifecycle_state & (1ULL << MODE_MENU)) driver.menu_ctx->frame(d3d);
menu_iterate_xui();
#endif
if (d3d && d3d->rgui_texture_enable) if (d3d && d3d->rgui_texture_enable)
d3d_draw_texture(d3d); d3d_draw_texture(d3d);