diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 4a4f9c8f9b..d9be0a9cdf 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -244,7 +244,7 @@ static void gl_render_overlay(gl_t *gl)
    coords.handle_data   = NULL;
    coords.data          = &gl->coords;
 
-   video_shader_driver_set_coords(&coords);
+   video_shader_driver_set_coords(coords);
 
    mvp.data             = gl;
    mvp.matrix           = &gl->mvp_no_rot;
@@ -521,7 +521,6 @@ static void gl_update_input_size(gl_t *gl, unsigned width,
    GLfloat xamt, yamt;
    bool set_coords = false;
 
-
    if ((width != gl->last_width[gl->tex_index] ||
             height != gl->last_height[gl->tex_index]) && gl->empty_buf)
    {
@@ -1048,7 +1047,7 @@ static INLINE void gl_draw_texture(gl_t *gl)
    coords.handle_data   = NULL;
    coords.data          = &gl->coords;
 
-   video_shader_driver_set_coords(&coords);
+   video_shader_driver_set_coords(coords);
 
    mvp.data             = gl;
    mvp.matrix           = &gl->mvp_no_rot;
@@ -1247,7 +1246,7 @@ static bool gl_frame(void *data, const void *frame,
    coords.handle_data   = NULL;
    coords.data          = &gl->coords;
 
-   video_shader_driver_set_coords(&coords);
+   video_shader_driver_set_coords(coords);
 
    mvp.data             = gl;
    mvp.matrix           = &gl->mvp;
diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
index 983d25dd53..23f9a054f2 100644
--- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
+++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
@@ -337,7 +337,7 @@ void gl_renderchain_render(gl_t *gl,
       coords.handle_data  = NULL;
       coords.data         = &gl->coords;
 
-      video_shader_driver_set_coords(&coords);
+      video_shader_driver_set_coords(coords);
 
       mvp.data = gl;
       mvp.matrix = &gl->mvp;
@@ -413,7 +413,7 @@ void gl_renderchain_render(gl_t *gl,
    coords.handle_data   = NULL;
    coords.data          = &gl->coords;
 
-   video_shader_driver_set_coords(&coords);
+   video_shader_driver_set_coords(coords);
 
    mvp.data             = gl;
    mvp.matrix           = &gl->mvp;
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 2f5c3870a9..c269a21575 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -259,7 +259,7 @@ static void gl_raster_font_draw_vertices(gl_raster_t *font, const video_coords_t
    coords_data.handle_data = NULL;
    coords_data.data        = coords;
 
-   video_shader_driver_set_coords(&coords_data);
+   video_shader_driver_set_coords(coords_data);
 
    mvp.data = font->gl;
    mvp.matrix = &font->gl->mvp_no_rot;
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
index 7f37a8aa42..53091fa47b 100644
--- a/gfx/video_shader_driver.c
+++ b/gfx/video_shader_driver.c
@@ -199,16 +199,6 @@ bool video_shader_driver_mipmap_input(unsigned *index)
    return false;
 }
 
-bool video_shader_driver_set_coords(video_shader_ctx_coords_t *coords)
-{
-   if (     current_shader 
-         && current_shader->set_coords
-         && current_shader->set_coords(coords->handle_data,
-            shader_data, (const struct video_coords*)coords->data))
-      return true;
-   return false;
-}
-
 bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
 {
    if (!scaler || !scaler->scale)
diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h
index db36f56584..eeacad34f9 100644
--- a/gfx/video_shader_driver.h
+++ b/gfx/video_shader_driver.h
@@ -291,7 +291,9 @@ bool video_shader_driver_get_feedback_pass(unsigned *data);
 
 bool video_shader_driver_mipmap_input(unsigned *index);
 
-bool video_shader_driver_set_coords(video_shader_ctx_coords_t *coords);
+#define video_shader_driver_set_coords(coords) \
+   if (current_shader && current_shader->set_coords) \
+      current_shader->set_coords(coords.handle_data, shader_data, (const struct video_coords*)coords.data)
 
 bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);
 
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 5ed948a00e..efdbb37e82 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -174,7 +174,7 @@ static void menu_display_d3d_draw(void *data)
    if (!mat)
       mat                         = (math_matrix_4x4*)
          menu_display_d3d_get_default_mvp();
-   video_shader_driver_set_coords(d3d, draw->coords);
+   video_shader_driver_set_coords(draw->coords);
    video_shader_driver_set_mvp(mat);
 #endif
 
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index 8ff4c96b54..52741649d8 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -140,7 +140,7 @@ static void menu_display_gl_draw(void *data)
    coords.handle_data = gl;
    coords.data        = draw->coords;
    
-   video_shader_driver_set_coords(&coords);
+   video_shader_driver_set_coords(coords);
 
    mvp.data   = gl;
    mvp.matrix = draw->matrix_data ? (math_matrix_4x4*)draw->matrix_data