diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 795cbeac66..1c0e2b4d3c 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -595,7 +595,9 @@ static void gl2_renderchain_render( mip_level = i + 1; - if (video_shader_driver_mipmap_input(&mip_level) + if ( + gl->shader->mipmap_input && + gl->shader->mipmap_input(gl->shader_data, mip_level) && gl->have_mipmap) glGenerateMipmap(GL_TEXTURE_2D); @@ -668,8 +670,10 @@ static void gl2_renderchain_render( mip_level = chain->fbo_pass + 1; - if (video_shader_driver_mipmap_input(&mip_level) - && gl->have_mipmap) + if ( + gl->shader->mipmap_input && + gl->shader->mipmap_input(gl->shader_data, mip_level) && + gl->have_mipmap) glGenerateMipmap(GL_TEXTURE_2D); glClear(GL_COLOR_BUFFER_BIT); @@ -864,7 +868,7 @@ static void gl_create_fbo_texture(gl_t *gl, GLuint base_mip_filt = settings->bools.video_smooth ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST; unsigned mip_level = i + 2; - bool mipmapped = video_shader_driver_mipmap_input(&mip_level); + 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; @@ -3444,7 +3448,7 @@ static void *gl_init(const video_info_t *video, gl_set_shader_viewports(gl); mip_level = 1; - gl->tex_mipmap = video_shader_driver_mipmap_input(&mip_level); + gl->tex_mipmap = gl->shader->mipmap_input(gl->shader_data, mip_level); shader_filter.index = 1; shader_filter.smooth = &force_smooth; @@ -3599,7 +3603,7 @@ static void gl_update_tex_filter_frame(gl_t *gl) video_shader_driver_wrap_type(&wrap_info); wrap_mode = gl_wrap_type_to_enum(wrap_info.type); - gl->tex_mipmap = video_shader_driver_mipmap_input(&mip_level); + gl->tex_mipmap = gl->shader->mipmap_input(gl->shader_data, mip_level); gl->video_info.smooth = smooth; new_filt = gl->tex_mipmap ? (smooth ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index cbe9d41c3a..157fbd2393 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -3669,11 +3669,6 @@ bool video_shader_driver_get_feedback_pass(unsigned *data) return current_shader->get_feedback_pass(current_shader_data, data); } -bool video_shader_driver_mipmap_input(unsigned *index) -{ - return current_shader->mipmap_input(current_shader_data, *index); -} - 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 1a8f8c453b..8af03ebeef 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -1206,8 +1206,6 @@ bool video_shader_driver_init(video_shader_ctx_init_t *init); bool video_shader_driver_get_feedback_pass(unsigned *data); -bool video_shader_driver_mipmap_input(unsigned *index); - void video_driver_set_coords(video_shader_ctx_coords_t *coords); bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);