diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 1c0e2b4d3c..f550f237b5 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -621,7 +621,8 @@ static void gl2_renderchain_render(
       params.fbo_info      = fbo_tex_info;
       params.fbo_info_cnt  = fbo_tex_info_cnt;
 
-      video_shader_driver_set_parameters(&params);
+      if (gl->shader->set_params)
+         gl->shader->set_params(&params, gl->shader_data);
 
       gl->coords.vertices = 4;
 
@@ -694,7 +695,8 @@ static void gl2_renderchain_render(
    params.fbo_info      = fbo_tex_info;
    params.fbo_info_cnt  = fbo_tex_info_cnt;
 
-   video_shader_driver_set_parameters(&params);
+   if (gl->shader->set_params)
+      gl->shader->set_params(&params, gl->shader_data);
 
    gl->coords.vertex    = gl->vertex_ptr;
 
@@ -1162,7 +1164,7 @@ static void gl2_renderchain_init(
             gl->fbo_rect[i].width, gl->fbo_rect[i].height);
    }
 
-   gl->fbo_feedback_enable = video_shader_driver_get_feedback_pass(
+   gl->fbo_feedback_enable = gl->shader->get_feedback_pass(gl->shader_data,
          &gl->fbo_feedback_pass);
 
    if (gl->fbo_feedback_enable && gl->fbo_feedback_pass
@@ -2380,7 +2382,9 @@ static void gl_render_osd_background(
    uniform_param.result.f.v2       = colors[2];
    uniform_param.result.f.v3       = colors[3];
 
-   video_shader_driver_set_parameter(&uniform_param);
+   if (gl->shader->set_uniform_parameter)
+      gl->shader->set_uniform_parameter(gl->shader_data,
+            &uniform_param, NULL);
 
    glDrawArrays(GL_TRIANGLES, 0, coords.vertices);
 
@@ -2390,7 +2394,9 @@ static void gl_render_osd_background(
    uniform_param.result.f.v2       = 0.0f;
    uniform_param.result.f.v3       = 0.0f;
 
-   video_shader_driver_set_parameter(&uniform_param);
+   if (gl->shader->set_uniform_parameter)
+      gl->shader->set_uniform_parameter(gl->shader_data,
+            &uniform_param, NULL);
 
    free(dummy);
    free(verts);
@@ -2657,7 +2663,8 @@ static bool gl_frame(void *data, const void *frame,
    params.fbo_info      = NULL;
    params.fbo_info_cnt  = 0;
 
-   video_shader_driver_set_parameters(&params);
+   if (gl->shader->set_params)
+      gl->shader->set_params(&params, gl->shader_data);
 
    gl->coords.vertices  = 4;
    coords.handle_data   = NULL;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 157fbd2393..ac602c0b3e 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -3458,19 +3458,6 @@ static const shader_backend_t *video_shader_set_backend(
    return NULL;
 }
 
-void video_shader_driver_set_parameter(struct uniform_info *param)
-{
-   if (current_shader && current_shader->set_uniform_parameter)
-      current_shader->set_uniform_parameter(current_shader_data,
-            param, NULL);
-}
-
-void video_shader_driver_set_parameters(video_shader_ctx_params_t *params)
-{
-   if (current_shader && current_shader->set_params)
-      current_shader->set_params(params, current_shader_data);
-}
-
 bool video_shader_driver_get_prev_textures(
       video_shader_ctx_texture_t *texture)
 {
@@ -3580,13 +3567,6 @@ static unsigned video_shader_driver_num_null(void *data)
    return 0;
 }
 
-static bool video_shader_driver_get_feedback_pass_null(
-      void *data, unsigned *idx)
-{
-   (void)idx;
-   return false;
-}
-
 static void video_shader_driver_reset_to_defaults(void)
 {
    if (!current_shader)
@@ -3616,8 +3596,6 @@ static void video_shader_driver_reset_to_defaults(void)
       current_shader->num_shaders       = video_shader_driver_num_null;
    if (!current_shader->get_current_shader)
       current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
-   if (!current_shader->get_feedback_pass)
-      current_shader->get_feedback_pass = video_shader_driver_get_feedback_pass_null;
 }
 
 /* Finds first suitable shader context driver. */
@@ -3664,11 +3642,6 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init)
    return true;
 }
 
-bool video_shader_driver_get_feedback_pass(unsigned *data)
-{
-   return current_shader->get_feedback_pass(current_shader_data, data);
-}
-
 bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
 {
    if (!scaler || !scaler->scale)
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 8af03ebeef..8638670c46 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -1196,16 +1196,10 @@ bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
 
 bool video_shader_driver_deinit(void);
 
-void video_shader_driver_set_parameter(struct uniform_info *param);
-
-void video_shader_driver_set_parameters(video_shader_ctx_params_t *params);
-
 bool video_shader_driver_init_first(void);
 
 bool video_shader_driver_init(video_shader_ctx_init_t *init);
 
-bool video_shader_driver_get_feedback_pass(unsigned *data);
-
 void video_driver_set_coords(video_shader_ctx_coords_t *coords);
 
 bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index 80fb9142de..53a17708fc 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -192,7 +192,9 @@ static void menu_display_gl_draw_pipeline(menu_display_ctx_draw_t *draw,
 
          uniform_param.result.f.v0       = t;
 
-         video_shader_driver_set_parameter(&uniform_param);
+         if (gl->shader->set_uniform_parameter)
+            gl->shader->set_uniform_parameter(gl->shader_data,
+                  &uniform_param, NULL);
          break;
    }
 
@@ -208,7 +210,9 @@ static void menu_display_gl_draw_pipeline(menu_display_ctx_draw_t *draw,
          uniform_param.result.f.v0       = draw->width;
          uniform_param.result.f.v1       = draw->height;
 
-         video_shader_driver_set_parameter(&uniform_param);
+         if (gl->shader->set_uniform_parameter)
+            gl->shader->set_uniform_parameter(gl->shader_data,
+                  &uniform_param, NULL);
 #endif
          break;
    }