ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create menu_driver_frame

This commit is contained in:
twinaphex 2015-03-22 05:27:19 +01:00
parent 0fd8fb77e9
commit a760d25384
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/d3d/d3d.cpp
View File

@ -1735,9 +1735,8 @@ static bool d3d_frame(void *data, const void *frame,
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (runloop->is_menu if (runloop->is_menu)
&& driver->menu_ctx && driver->menu_ctx->frame) menu_driver_frame();
driver->menu_ctx->frame();
#ifdef _XBOX #ifdef _XBOX
/* TODO - should be refactored. */ /* TODO - should be refactored. */

8
gfx/drivers/gl.c
View File

@ -1603,15 +1603,11 @@ static bool gl_frame(void *data, const void *frame,
gl_set_prev_texture(gl, &gl->tex_info); gl_set_prev_texture(gl, &gl->tex_info);
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
{ if (runloop->is_menu)
driver_t *driver = driver_get_ptr(); menu_driver_frame();
if (runloop->is_menu
&& driver->menu_ctx && driver->menu_ctx->frame)
driver->menu_ctx->frame();
if (gl->menu_texture_enable) if (gl->menu_texture_enable)
gl_draw_texture(gl); gl_draw_texture(gl);
}
#endif #endif
if (msg && gl->font_driver && gl->font_handle) if (msg && gl->font_driver && gl->font_handle)

5
gfx/drivers/sdl2_gfx.c
View File

@ -511,9 +511,8 @@ static bool sdl2_gfx_frame(void *data, const void *frame, unsigned width,
SDL_RenderCopyEx(vid->renderer, vid->frame.tex, NULL, NULL, vid->rotation, NULL, SDL_FLIP_NONE); SDL_RenderCopyEx(vid->renderer, vid->frame.tex, NULL, NULL, vid->rotation, NULL, SDL_FLIP_NONE);
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (runloop->is_menu if (runloop->is_menu)
&& driver->menu_ctx && driver->menu_ctx->frame) menu_driver_frame();
driver->menu_ctx->frame();
#endif #endif
if (vid->menu.active) if (vid->menu.active)

10
menu/menu_driver.c
View File

@ -245,3 +245,13 @@ void menu_driver_context_reset(void)
if (driver->menu_ctx && driver->menu_ctx->context_reset) if (driver->menu_ctx && driver->menu_ctx->context_reset)
driver->menu_ctx->context_reset(); driver->menu_ctx->context_reset();
} }
void menu_driver_frame(void)
{
driver_t *driver = driver_get_ptr();
if (!driver)
return;
if (driver->menu_ctx && driver->menu_ctx->frame)
driver->menu_ctx->frame();
}

2
menu/menu_driver.h
View File

@ -300,6 +300,8 @@ void menu_driver_navigation_set_last(void);
void menu_driver_set_texture(void); void menu_driver_set_texture(void);
void menu_driver_frame(void);
void menu_driver_context_reset(void); void menu_driver_context_reset(void);
#ifdef __cplusplus #ifdef __cplusplus