diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c index f5c97afdc9..571bd1e87a 100644 --- a/gfx/drivers_shader/shader_null.c +++ b/gfx/drivers_shader/shader_null.c @@ -51,7 +51,7 @@ static bool shader_null_set_mvp(void *data, const math_matrix_4x4 *mat) { #ifdef HAVE_OPENGL #ifndef NO_GL_FF_MATRIX - gl_t *gl = (gl_t*)video_driver_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); if (gl) { gl_ff_matrix(mat); @@ -65,7 +65,7 @@ static bool shader_null_set_coords(const void *data) { #ifdef HAVE_OPENGL #ifndef NO_GL_FF_VERTEX - gl_t *gl = (gl_t*)video_driver_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); if (gl) { const struct gl_coords *coords = (const struct gl_coords*)data; diff --git a/gfx/video_driver.c b/gfx/video_driver.c index a88ec8a555..21c22ea45e 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -194,7 +194,7 @@ void find_video_driver(void) } /** - * video_driver_resolve: + * video_driver_get_ptr: * @drv : real video driver will be set to this. * * Use this if you need the real video driver @@ -202,7 +202,7 @@ void find_video_driver(void) * * Returns: video driver's userdata. **/ -void *video_driver_resolve(const video_driver_t **drv) +void *video_driver_get_ptr(const video_driver_t **drv) { driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); diff --git a/gfx/video_driver.h b/gfx/video_driver.h index aff7b59dcf..07013bfd32 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -239,7 +239,7 @@ const char* config_get_video_driver_options(void); void find_video_driver(void); /** - * video_driver_resolve: + * video_driver_get_ptr: * @drv : real video driver will be set to this. * * Use this if you need the real video driver @@ -247,7 +247,7 @@ void find_video_driver(void); * * Returns: video driver's userdata. **/ -void *video_driver_resolve(const video_driver_t **drv); +void *video_driver_get_ptr(const video_driver_t **drv); /** * video_driver_get_current_framebuffer: diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index d5fd9e4525..3a7949aa14 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -233,7 +233,7 @@ static void glui_render_messagebox(const char *message) if (!menu) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -283,7 +283,7 @@ static void glui_render(void) if (!glui) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -341,7 +341,7 @@ static void glui_frame(void) if (!menu) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -478,7 +478,7 @@ static void *glui_init(void) glui_handle_t *glui = NULL; const video_driver_t *video_driver = NULL; menu_handle_t *menu = NULL; - gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); + gl_t *gl = (gl_t*)video_driver_get_ptr(&video_driver); if (video_driver != &video_gl || !gl) { diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9503369f2d..1a4f0c3055 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -517,7 +517,7 @@ static void xmb_frame_messagebox(const char *message) if (!xmb) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -1262,7 +1262,7 @@ static void xmb_frame(void) if (!xmb) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return; @@ -1393,7 +1393,7 @@ static void *xmb_init(void) xmb_handle_t *xmb = NULL; const video_driver_t *video_driver = NULL; float scale_factor = 1; - gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); + gl_t *gl = (gl_t*)video_driver_get_ptr(&video_driver); global_t *global = global_get_ptr(); if (video_driver != &video_gl || !gl) @@ -1583,7 +1583,7 @@ static void xmb_context_reset(void) if (!menu) return; - gl = (gl_t*)video_driver_resolve(NULL); + gl = (gl_t*)video_driver_get_ptr(NULL); if (!gl) return;