From 2dfc1883f086493e3ca037d781df599fc8b26be5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 19 Jan 2015 04:22:49 +0100 Subject: [PATCH] Rename driver_video_resolve --- gfx/drivers_shader/shader_null.c | 4 ++-- gfx/video_driver.c | 4 ++-- gfx/video_driver.h | 4 ++-- menu/drivers_display/glui.c | 14 +++++++------- menu/drivers_display/lakka.c | 16 ++++++++-------- menu/drivers_display/xmb.c | 14 +++++++------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c index cfbccd9ed4..c023ccd8c9 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*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(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*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(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 1db67ed60d..86bafa55dc 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -168,7 +168,7 @@ void find_video_driver(void) } /** - * driver_video_resolve: + * video_driver_resolve: * @drv : real video driver will be set to this. * * Use this if you need the real video driver @@ -176,7 +176,7 @@ void find_video_driver(void) * * Returns: video driver's userdata. **/ -void *driver_video_resolve(const video_driver_t **drv) +void *video_driver_resolve(const video_driver_t **drv) { #ifdef HAVE_THREADS if (g_settings.video.threaded diff --git a/gfx/video_driver.h b/gfx/video_driver.h index f8a1a853a2..83cbeaeced 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -218,7 +218,7 @@ const char* config_get_video_driver_options(void); void find_video_driver(void); /** - * driver_video_resolve: + * video_driver_resolve: * @drv : real video driver will be set to this. * * Use this if you need the real video driver @@ -226,7 +226,7 @@ void find_video_driver(void); * * Returns: video driver's userdata. **/ -void *driver_video_resolve(const video_driver_t **drv); +void *video_driver_resolve(const video_driver_t **drv); /** * video_driver_get_current_framebuffer: diff --git a/menu/drivers_display/glui.c b/menu/drivers_display/glui.c index ebc80f7367..6d93eab4b6 100644 --- a/menu/drivers_display/glui.c +++ b/menu/drivers_display/glui.c @@ -42,7 +42,7 @@ typedef struct glui_handle static void glui_blit_line(float x, float y, const char *message, bool green) { struct font_params params = {0}; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!driver.menu || !gl) return; @@ -105,7 +105,7 @@ static void glui_render_background(bool force_transparency) 0.0f, 0.0f, 0.0f, alpha, }; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -175,7 +175,7 @@ static void glui_draw_cursor(float x, float y) if (!glui) return; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -224,7 +224,7 @@ static void glui_render_messagebox(const char *message) int x, y; struct string_list *list = NULL; glui_handle_t *glui = NULL; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!driver.menu || !gl) return; @@ -268,7 +268,7 @@ static void glui_frame(void) const char *label = NULL; unsigned menu_type = 0; size_t end; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); glui_handle_t *glui = NULL; const char *core_name = NULL; const char *core_version = NULL; @@ -452,7 +452,7 @@ static void *glui_init(void) menu_handle_t *menu; glui_handle_t *glui = NULL; const video_driver_t *video_driver = NULL; - gl_t *gl = (gl_t*)driver_video_resolve(&video_driver); + gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); if (video_driver != &video_gl || !gl) { @@ -548,7 +548,7 @@ static void glui_context_reset(void *data) char bgpath[PATH_MAX_LENGTH]; glui_handle_t *glui = NULL; menu_handle_t *menu = (menu_handle_t*)data; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); (void)gl; diff --git a/menu/drivers_display/lakka.c b/menu/drivers_display/lakka.c index 9268e57f9d..d932759308 100644 --- a/menu/drivers_display/lakka.c +++ b/menu/drivers_display/lakka.c @@ -102,7 +102,7 @@ static void lakka_draw_text(lakka_handle_t *lakka, if (a8 == 0) return; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -158,7 +158,7 @@ static void lakka_draw_background(bool force_transparency) 0.0f, 0.0f, 0.0f, alpha, }; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -213,7 +213,7 @@ static void lakka_draw_icon(lakka_handle_t *lakka, if (alpha == 0) return; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -482,7 +482,7 @@ static void lakka_check_fb_status(void) static void lakka_fbo_reset(lakka_handle_t *lakka) { - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -517,7 +517,7 @@ static void lakka_fbo_reset(lakka_handle_t *lakka) static void lakka_draw_fbo(lakka_handle_t *lakka) { - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -563,7 +563,7 @@ static void lakka_frame(void) menu_item_t *active_item = NULL; menu_category_t *active_category = NULL; lakka_handle_t *lakka = NULL; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -906,7 +906,7 @@ static void lakka_context_reset(void *data) if (!lakka) return; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -1192,7 +1192,7 @@ static void *lakka_init(void) menu_handle_t *menu = NULL; lakka_handle_t *lakka = NULL; const video_driver_t *video_driver = NULL; - gl_t *gl = (gl_t*)driver_video_resolve(&video_driver); + gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); if (video_driver != &video_gl || !gl) { diff --git a/menu/drivers_display/xmb.c b/menu/drivers_display/xmb.c index b9464eb368..39c7f1e91a 100644 --- a/menu/drivers_display/xmb.c +++ b/menu/drivers_display/xmb.c @@ -191,7 +191,7 @@ static void xmb_draw_icon(GLuint texture, float x, float y, if (alpha == 0) return; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -251,7 +251,7 @@ static void xmb_draw_text(const char *str, float x, if (a8 == 0) return; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -321,7 +321,7 @@ static void xmb_render_background(bool force_transparency) 0.0f, 0.0f, 0.0f, alpha, }; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return; @@ -374,7 +374,7 @@ static void xmb_render_messagebox(const char *message) int x, y; unsigned i; struct string_list *list = NULL; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; if (!gl || !xmb) @@ -933,7 +933,7 @@ static void xmb_frame(void) const char *core_version = NULL; xmb_handle_t *xmb = (xmb_handle_t*)driver.menu->userdata; - gl_t *gl = (gl_t*)driver_video_resolve(NULL); + gl_t *gl = (gl_t*)video_driver_resolve(NULL); if (!xmb || !gl) return; @@ -1067,7 +1067,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*)driver_video_resolve(&video_driver); + gl_t *gl = (gl_t*)video_driver_resolve(&video_driver); if (video_driver != &video_gl || !gl) { @@ -1207,7 +1207,7 @@ static void xmb_context_reset(void *data) if (!menu) return; - gl = (gl_t*)driver_video_resolve(NULL); + gl = (gl_t*)video_driver_resolve(NULL); if (!gl) return;