libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-13 21:49:42 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Get rid of video_shader_driver_filter_type

Browse Source
This commit is contained in:
twinaphex 2019-02-03 05:28:00 +01:00
parent 6f7d67aa77
commit 7e92468508
3 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/drivers/gl.c
View File

@ -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;

18
gfx/video_driver.c
View File

@ -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)
{

2
gfx/video_driver.h
View File

@ -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);