From 7e92468508f83fb1c8c02e6403c26f93bc0aa892 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 3 Feb 2019 05:28:00 +0100
Subject: [PATCH] Get rid of video_shader_driver_filter_type

---
 gfx/drivers/gl.c   | 20 ++++++--------------
 gfx/video_driver.c | 18 ------------------
 gfx/video_driver.h |  2 --
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index f550f237b5..29b3eeee12 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -861,7 +861,6 @@ static void gl_create_fbo_texture(gl_t *gl,
       unsigned i, GLuint texture)
 {
    GLenum mag_filter, wrap_enum;
-   video_shader_ctx_filter_t filter_type;
    video_shader_ctx_wrap_t wrap  = {0};
    bool fp_fbo                   = false;
    bool smooth                   = false;
@@ -873,10 +872,8 @@ static void gl_create_fbo_texture(gl_t *gl,
    bool mipmapped                = gl->shader->mipmap_input(gl->shader_data, mip_level);
    GLenum min_filter             = mipmapped ? base_mip_filt : base_filt;
 
-   filter_type.index             = i + 2;
-   filter_type.smooth            = &smooth;
-
-   if (video_shader_driver_filter_type(&filter_type))
+   if (gl->shader->filter_type(gl->shader_data,
+            i + 2, smooth))
    {
       min_filter = mipmapped ? (smooth ?
             GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST)
@@ -3235,7 +3232,6 @@ static void *gl_init(const video_info_t *video,
    gfx_ctx_mode_t mode;
    gfx_ctx_input_t inp;
    unsigned full_x, full_y;
-   video_shader_ctx_filter_t shader_filter;
    video_shader_ctx_info_t shader_info;
    video_shader_ctx_ident_t ident_info;
    settings_t *settings                 = config_get_ptr();
@@ -3456,10 +3452,9 @@ static void *gl_init(const video_info_t *video,
 
    mip_level            = 1;
    gl->tex_mipmap       = gl->shader->mipmap_input(gl->shader_data, mip_level);
-   shader_filter.index  = 1;
-   shader_filter.smooth = &force_smooth;
 
-   if (video_shader_driver_filter_type(&shader_filter))
+   if (gl->shader->filter_type(gl->shader_data,
+            1, force_smooth))
       gl->tex_min_filter = gl->tex_mipmap ? (force_smooth ?
             GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST)
          : (force_smooth ? GL_LINEAR : GL_NEAREST);
@@ -3585,7 +3580,6 @@ static bool gl_suppress_screensaver(void *data, bool enable)
 
 static void gl_update_tex_filter_frame(gl_t *gl)
 {
-   video_shader_ctx_filter_t shader_filter;
    unsigned i, mip_level;
    GLenum wrap_mode;
    GLuint new_filt;
@@ -3598,10 +3592,8 @@ static void gl_update_tex_filter_frame(gl_t *gl)
 
    gl_context_bind_hw_render(gl, false);
 
-   shader_filter.index               = 1;
-   shader_filter.smooth              = &smooth;
-
-   if (!video_shader_driver_filter_type(&shader_filter))
+   if (!gl->shader->filter_type(gl->shader_data,
+            1, smooth))
       smooth = settings->bools.video_smooth;
 
    mip_level                         = 1;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index cbffb75638..5dee2b2396 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -3542,14 +3542,6 @@ static void video_shader_driver_scale_null(void *data,
    (void)scale;
 }
 
-static bool video_shader_driver_filter_type_null(
-      void *data, unsigned idx, bool *smooth)
-{
-   (void)idx;
-   (void)smooth;
-   return false;
-}
-
 static unsigned video_shader_driver_num_null(void *data)
 {
    return 0;
@@ -3574,8 +3566,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->filter_type)
-      current_shader->filter_type       = video_shader_driver_filter_type_null;
    if (!current_shader->num_shaders)
       current_shader->num_shaders       = video_shader_driver_num_null;
    if (!current_shader->get_current_shader)
@@ -3648,14 +3638,6 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
    return true;
 }
 
-bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
-{
-   if (filter)
-      return current_shader->filter_type(current_shader_data,
-            filter->index, filter->smooth);
-   return false;
-}
-
 bool video_shader_driver_compile_program(
       struct shader_program_info *program_info)
 {
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 8638670c46..449fa13e7f 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -1208,8 +1208,6 @@ bool video_shader_driver_info(video_shader_ctx_info_t *shader_info);
 
 void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp);
 
-bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter);
-
 bool video_shader_driver_compile_program(struct shader_program_info *program_info);
 
 bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap);