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

Do life cycle state checking outside of graphics driver for 

menu display driver's 'frame' function
This commit is contained in:
twinaphex 2014-09-14 06:02:05 +02:00
parent 259d75fa6e
commit 06bea05634
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/d3d9/d3d.cpp
View File

@ -1586,8 +1586,7 @@ static bool d3d_frame(void *data, const void *frame,
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (g_extern.lifecycle_state & (1ULL << MODE_MENU) if (driver.menu_ctx && driver.menu_ctx->frame)
&& driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame(); driver.menu_ctx->frame();
#ifdef _XBOX #ifdef _XBOX

3
gfx/gl.c
View File

@ -1592,8 +1592,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
gl_set_prev_texture(gl, &tex_info); gl_set_prev_texture(gl, &tex_info);
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
if ((g_extern.lifecycle_state & (1ULL << MODE_MENU)) if (driver.menu_ctx && driver.menu_ctx->frame)
&& driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame(); driver.menu_ctx->frame();
if (gl->menu_texture_enable) if (gl->menu_texture_enable)

2
gfx/sdl2_gfx.c
View File

@ -490,7 +490,7 @@ 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 (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame) if (driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame(); driver.menu_ctx->frame();
#endif #endif