diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h index 8da6c19cb6..8b11009bb7 100644 --- a/gfx/common/gl_common.h +++ b/gfx/common/gl_common.h @@ -370,6 +370,21 @@ void gl_load_texture_data( unsigned width, unsigned height, const void *frame, unsigned base_size); +static INLINE GLenum gl_min_filter_to_mag(GLenum type) +{ + switch (type) + { + case GL_LINEAR_MIPMAP_LINEAR: + return GL_LINEAR; + case GL_NEAREST_MIPMAP_NEAREST: + return GL_NEAREST; + default: + break; + } + + return type; +} + RETRO_END_DECLS #endif diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index e0a97310ad..712259ff39 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -427,21 +427,6 @@ static bool gl_shader_init(gl_t *gl, const gfx_ctx_driver_t *ctx_driver, return video_shader_driver_init(&init_data); } -GLenum min_filter_to_mag(GLenum type) -{ - switch (type) - { - case GL_LINEAR_MIPMAP_LINEAR: - return GL_LINEAR; - case GL_NEAREST_MIPMAP_NEAREST: - return GL_NEAREST; - default: - break; - } - - return type; -} - static uintptr_t gl_get_current_framebuffer(void *data) { gl_t *gl = (gl_t*)data; @@ -1943,7 +1928,7 @@ static void *gl_init(const video_info_t *video, (video->smooth ? GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST) : (video->smooth ? GL_LINEAR : GL_NEAREST); - gl->tex_mag_filter = min_filter_to_mag(gl->tex_min_filter); + gl->tex_mag_filter = gl_min_filter_to_mag(gl->tex_min_filter); wrap_info.idx = 1; @@ -2102,7 +2087,7 @@ static void gl_update_tex_filter_frame(gl_t *gl) return; gl->tex_min_filter = new_filt; - gl->tex_mag_filter = min_filter_to_mag(gl->tex_min_filter); + gl->tex_mag_filter = gl_min_filter_to_mag(gl->tex_min_filter); gl->wrap_mode = wrap_mode; for (i = 0; i < gl->textures; i++) diff --git a/gfx/drivers_renderchain/gl2_renderchain.c b/gfx/drivers_renderchain/gl2_renderchain.c index 0113bab0e2..52ac479b11 100644 --- a/gfx/drivers_renderchain/gl2_renderchain.c +++ b/gfx/drivers_renderchain/gl2_renderchain.c @@ -166,8 +166,6 @@ static void gl2_renderchain_bind_backbuffer(void *data, void context_bind_hw_render(bool enable); -GLenum min_filter_to_mag(GLenum type); - void gl_load_texture_data( uint32_t id_data, enum gfx_wrap_type wrap_type, @@ -629,7 +627,7 @@ static void gl_create_fbo_texture(gl_t *gl, : (smooth ? GL_LINEAR : GL_NEAREST); } - mag_filter = min_filter_to_mag(min_filter); + mag_filter = gl_min_filter_to_mag(min_filter); wrap.idx = i + 2; video_shader_driver_wrap_type(&wrap);