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

(gl_raster_font.c) Fix some race issues

Browse Source
This commit is contained in:
twinaphex 2016-03-01 17:24:33 +01:00
parent 89bcdeaf0b
commit 81690601c0
1 changed files with 12 additions and 6 deletions

18
gfx/drivers_font/gl_raster_font.c

@ -194,13 +194,18 @@ static void gl_raster_font_free_font(void *data)
static int gl_get_message_width(void *data, const char *msg,
unsigned msg_len_full, float scale)
{
gl_raster_t *font = (gl_raster_t*)data;
unsigned i;
unsigned msg_len = min(msg_len_full, MAX_MSG_LEN_CHUNK);
int delta_x = 0;
int delta_x = 0;
unsigned msg_len = min(msg_len_full, MAX_MSG_LEN_CHUNK);
gl_raster_t *font = (gl_raster_t*)data;
if (!font || !font->font_driver || !font->font_data)
if (!font)
return 0;
if (
!font->font_driver
|| !font->font_driver->get_glyph
|| !font->font_data )
return 0;
while (msg_len_full)
@ -345,6 +350,7 @@ static void gl_raster_font_render_message(
|| !*msg
|| !font->gl
|| !font
|| !font->font_data
|| !font->font_driver)
return;
@ -475,7 +481,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg,
drop_mod = 0.3f;
}
if (font->block)
if (font && font->block)
font->block->fullscreen = full_screen;
else
gl_raster_font_setup_viewport(font, full_screen);