From 3162bb796a63a77e46e9efa477a996313d2b50ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 20 Nov 2015 17:46:42 +0100 Subject: [PATCH] Reduce video_driver_get_ptr calls --- menu/drivers_display/menu_display_gl.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index caaa7e3b6c..b6ca70e78b 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -38,9 +38,17 @@ static const GLfloat gl_tex_coords[] = { 1, 0 }; -static void *menu_display_gl_get_default_mvp(void) +static gl_t *gl_get_ptr(void) { gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); + if (!gl) + return NULL; + return gl; +} + +static void *menu_display_gl_get_default_mvp(void) +{ + gl_t *gl = gl_get_ptr(); if (!gl) return NULL; @@ -66,7 +74,7 @@ static GLenum menu_display_prim_to_gl_enum(enum menu_display_prim_type prim_type static void menu_display_gl_blend_begin(void) { - gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); + gl_t *gl = gl_get_ptr(); if (!gl) return; @@ -93,7 +101,7 @@ static void menu_display_gl_draw( ) { driver_t *driver = driver_get_ptr(); - gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); + gl_t *gl = gl_get_ptr(); math_matrix_4x4 *mat = (math_matrix_4x4*)matrix_data; if (!gl) @@ -141,7 +149,7 @@ static void menu_display_gl_draw_bg( const GLfloat *new_tex_coord = NULL; global_t *global = global_get_ptr(); settings_t *settings = config_get_ptr(); - gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); + gl_t *gl = gl_get_ptr(); if (!gl) return;