From 4d7c2a642df611262097b41e8629a94abe718837 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 11 May 2015 00:20:06 +0200 Subject: [PATCH] (GL) Cleanups --- gfx/drivers/gl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 3c9793b689..2ecea6b759 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1737,13 +1737,12 @@ static void gl_free(void *data) { gl_t *gl = (gl_t*)data; driver_t *driver = driver_get_ptr(); - const struct font_renderer *font_driver = NULL; + const struct font_renderer *font_driver = driver ? + driver->font_osd_driver : NULL; if (!gl) return; - font_driver = (const struct font_renderer*)driver->font_osd_driver; - context_bind_hw_render(gl, false); #ifdef HAVE_GL_SYNC @@ -3138,14 +3137,13 @@ static void gl_apply_state_changes(void *data) static void gl_set_osd_msg(void *data, const char *msg, const struct font_params *params, void *font) { - const struct font_renderer *font_driver = NULL; driver_t *driver = driver_get_ptr(); + const struct font_renderer *font_driver = driver ? + driver->font_osd_driver : NULL; gl_t *gl = (gl_t*)data; if (!gl) return; - font_driver = (const struct font_renderer*)driver->font_osd_driver; - if (!font) font = driver->font_osd_data;