From ffc5ba098034b01d72dd767b0bbe87869b2ecadc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 10 Apr 2015 09:15:25 +0200 Subject: [PATCH] Make gfx_ctx_get_ptr static --- gfx/d3d/d3d.cpp | 2 -- gfx/drivers/gl.c | 3 --- gfx/video_context_driver.c | 2 +- gfx/video_context_driver.h | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp index c1ade1fffa..cae1c924de 100644 --- a/gfx/d3d/d3d.cpp +++ b/gfx/d3d/d3d.cpp @@ -428,7 +428,6 @@ static bool d3d_construct(d3d_video_t *d3d, unsigned full_x, full_y; driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); - const gfx_ctx_driver_t *ctx = gfx_ctx_get_ptr(); d3d->should_resize = false; @@ -1468,7 +1467,6 @@ static bool d3d_frame(void *data, const void *frame, settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); const font_renderer_t *font_ctx = d3d ? (const font_renderer_t*)d3d->font_driver : NULL; - const gfx_ctx_driver_t *ctx = gfx_ctx_get_ptr(); (void)i; diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 24aae2cb98..32116a5c8f 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1188,9 +1188,6 @@ static void gl_init_textures_data(gl_t *gl) static void gl_init_textures(gl_t *gl, const video_info_t *video) { unsigned i; - const gfx_ctx_driver_t *ctx = gfx_ctx_get_ptr(); - - (void)ctx; #if defined(HAVE_EGL) && defined(HAVE_OPENGLES2) // Use regular textures if we use HW render. diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c index 32bca51c7f..02369ddcd9 100644 --- a/gfx/video_context_driver.c +++ b/gfx/video_context_driver.c @@ -74,7 +74,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { }; -const gfx_ctx_driver_t *gfx_ctx_get_ptr(void) +static const gfx_ctx_driver_t *gfx_ctx_get_ptr(void) { driver_t *driver = driver_get_ptr(); if (!driver) diff --git a/gfx/video_context_driver.h b/gfx/video_context_driver.h index ca939ebd0f..8b3995f508 100644 --- a/gfx/video_context_driver.h +++ b/gfx/video_context_driver.h @@ -198,8 +198,6 @@ void find_next_context_driver(void); **/ void find_prev_gfx_context_driver(void); -const gfx_ctx_driver_t *gfx_ctx_get_ptr(void); - bool gfx_ctx_get_metrics(enum display_metric_types type, float *value); void gfx_ctx_translate_aspect(void *data, float *aspect,