Merge pull request #1547 from heuripedes/gl-perf
Some OpenGL menu fixes
This commit is contained in:
commit
364d8b8b7a
|
@ -322,7 +322,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg,
|
|||
}
|
||||
|
||||
if (font->block)
|
||||
font->block->fullscreen = true;
|
||||
font->block->fullscreen = full_screen;
|
||||
else
|
||||
setup_viewport(font, full_screen);
|
||||
|
||||
|
|
|
@ -482,15 +482,15 @@ draw_text:
|
|||
glui->box_message[0] = '\0';
|
||||
}
|
||||
|
||||
if (settings->menu.mouse.enable)
|
||||
glui_draw_cursor(gl, menu->mouse.x, menu->mouse.y);
|
||||
|
||||
if (glui->use_blocks)
|
||||
{
|
||||
gl->font_driver->flush(gl->font_handle);
|
||||
gl->font_driver->bind_block(gl->font_handle, NULL);
|
||||
}
|
||||
|
||||
if (settings->menu.mouse.enable)
|
||||
glui_draw_cursor(gl, menu->mouse.x, menu->mouse.y);
|
||||
|
||||
gl_set_viewport(gl, gl->win_width, gl->win_height, false, true);
|
||||
}
|
||||
|
||||
|
|
|
@ -1267,7 +1267,9 @@ static void xmb_frame(void)
|
|||
return;
|
||||
|
||||
if (gl->font_driver->bind_block)
|
||||
gl->font_driver->bind_block(gl->font_handle, &xmb->raster_block);
|
||||
gl->font_driver->bind_block(xmb->font.buf, &xmb->raster_block);
|
||||
|
||||
xmb->raster_block.carr.coords.vertices = 0;
|
||||
|
||||
xmb_frame_background(settings, gl, xmb, false);
|
||||
|
||||
|
@ -1385,8 +1387,8 @@ static void xmb_frame(void)
|
|||
|
||||
if (gl->font_driver->flush)
|
||||
{
|
||||
gl->font_driver->flush(gl->font_handle);
|
||||
gl->font_driver->bind_block(gl->font_handle, NULL);
|
||||
gl->font_driver->flush(xmb->font.buf);
|
||||
gl->font_driver->bind_block(xmb->font.buf, NULL);
|
||||
}
|
||||
|
||||
if (settings->menu.mouse.enable)
|
||||
|
|
Loading…
Reference in New Issue