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

Merge pull request #1685 from heuripedes/master

Browse Source 
Attempt to fix shared context issues
This commit is contained in:
Twinaphex 2015-05-10 21:21:57 +02:00
commit 8e93d13d67
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers/gl.c
View File

@ -3151,9 +3151,9 @@ static void gl_set_osd_msg(void *data, const char *msg,
if (driver->font_osd_driver && font)
{
context_bind_hw_render(gl, false);
/* context_bind_hw_render(gl, false); */
font_driver->render_msg(font, msg, params);
context_bind_hw_render(gl, true);
/* context_bind_hw_render(gl, true); */
}
}

4
menu/drivers/glui.c
View File

@ -107,7 +107,6 @@ static void glui_blit_line(float x, float y,
static void glui_render_quad(gl_t *gl, int x, int y, int w, int h,
float r, float g, float b, float a)
{
struct gl_coords coords;
menu_handle_t *menu = menu_driver_get_ptr();
glui_handle_t *glui = (glui_handle_t*)menu->userdata;
@ -366,7 +365,8 @@ static void glui_frame(void)
if (menu->need_refresh
&& runloop->is_menu
&& !menu->msg_force)
&& !menu->msg_force
&& !glui->box_message[0])
return;
menu_display_set_viewport(menu);