From add4ac00ebb70a9f2a3f56955c59fb240b8dc14b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 3 Feb 2019 06:28:27 +0100
Subject: [PATCH] Cleanups

---
 gfx/drivers/gl.c   |  7 ++++---
 gfx/video_driver.c | 19 -------------------
 gfx/video_driver.h |  2 --
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index e66afef33d..a019006d02 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -2416,11 +2416,12 @@ static void gl_show_mouse(void *data, bool state)
 
 static struct video_shader *gl_get_current_shader(void *data)
 {
-   video_shader_ctx_t shader_info = {0};
+   gl_t                            *gl = (gl_t*)data;
 
-   video_shader_driver_direct_get_current_shader(&shader_info);
+   if (!gl)
+      return NULL;
 
-   return shader_info.data;
+   return gl->shader->get_current_shader(gl->shader_data);
 }
 
 #if defined(HAVE_MENU)
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 0488dfc945..4ef0611f4a 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -3478,17 +3478,6 @@ bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
    return true;
 }
 
-bool video_shader_driver_direct_get_current_shader(
-      video_shader_ctx_t *shader)
-{
-   if (!current_shader)
-      return false;
-
-   shader->data = current_shader->get_current_shader(current_shader_data);
-
-   return true;
-}
-
 bool video_shader_driver_deinit(void)
 {
    if (!current_shader)
@@ -3513,12 +3502,6 @@ static bool video_driver_cb_set_mvp(void *data,
    return true;
 }
 
-static struct video_shader *
-video_shader_driver_get_current_shader_null(void *data)
-{
-   return NULL;
-}
-
 static void video_shader_driver_scale_null(void *data,
       unsigned idx, struct gfx_fbo_scale *scale)
 {
@@ -3543,8 +3526,6 @@ static void video_shader_driver_reset_to_defaults(void)
 
    if (!current_shader->shader_scale)
       current_shader->shader_scale      = video_shader_driver_scale_null;
-   if (!current_shader->get_current_shader)
-      current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
 }
 
 /* Finds first suitable shader context driver. */
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 53b5eb91c2..0221aabb6d 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -1184,8 +1184,6 @@ bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
 
 bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);
 
-bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
-
 bool video_shader_driver_deinit(void);
 
 bool video_shader_driver_init_first(void);