mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SHADER_CTL_FILTER_TYPE

Browse Source
This commit is contained in:
twinaphex 2016-02-14 19:51:32 +01:00
parent 37c2b47915
commit b4dcbb235f
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gfx/drivers/gl.c
View File

@ -459,6 +459,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture)
enum gfx_wrap_type wrap;
bool fp_fbo, srgb_fbo;
GLenum min_filter, mag_filter, wrap_enum;
video_shader_ctx_filter_t filter_type;
bool mipmapped = false;
bool smooth = false;
settings_t *settings = config_get_ptr();
@ -468,12 +469,13 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture)
glBindTexture(GL_TEXTURE_2D, texture);
mip_level = i + 2;
mip_level = i + 2;
mipmapped = video_shader_driver_ctl(SHADER_CTL_MIPMAP_INPUT, &mip_level);
min_filter = mipmapped ? base_mip_filt : base_filt;
filter_type.index = i + 2;
filter_type.smooth = &smooth;
mipmapped = video_shader_driver_ctl(SHADER_CTL_MIPMAP_INPUT, &mip_level);
min_filter = mipmapped ? base_mip_filt : base_filt;
if (video_shader_driver_filter_type(i + 2, &smooth))
if (video_shader_driver_ctl(SHADER_CTL_FILTER_TYPE, &filter_type))
{
min_filter = mipmapped ? (smooth ?
GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST)
@ -2621,6 +2623,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gfx_ctx_mode_t mode;
gfx_ctx_input_t inp;
unsigned interval, mip_level;
video_shader_ctx_filter_t shader_filter;
video_shader_ctx_info_t shader_info;
unsigned win_width, win_height, temp_width = 0, temp_height = 0;
bool force_smooth = false;
@ -2789,11 +2792,14 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gl_set_shader_viewport(gl, 0);
gl_set_shader_viewport(gl, 1);
mip_level = 1;
gl->tex_mipmap = video_shader_driver_ctl(SHADER_CTL_MIPMAP_INPUT,
mip_level = 1;
gl->tex_mipmap = video_shader_driver_ctl(SHADER_CTL_MIPMAP_INPUT,
&mip_level);
if (video_shader_driver_filter_type(1, &force_smooth))
shader_filter.index = 1;
shader_filter.smooth = &force_smooth;
if (video_shader_driver_ctl(SHADER_CTL_FILTER_TYPE, &shader_filter))
gl->tex_min_filter = gl->tex_mipmap ? (force_smooth ?
GL_LINEAR_MIPMAP_LINEAR : GL_NEAREST_MIPMAP_NEAREST)
: (force_smooth ? GL_LINEAR : GL_NEAREST);
@ -2926,6 +2932,7 @@ static bool gl_has_windowed(void *data)
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;
@ -2937,7 +2944,10 @@ static void gl_update_tex_filter_frame(gl_t *gl)
context_bind_hw_render(gl, false);
if (!video_shader_driver_filter_type(1, &smooth))
shader_filter.index = 1;
shader_filter.smooth = &smooth;
if (!video_shader_driver_ctl(SHADER_CTL_FILTER_TYPE, &shader_filter))
smooth = settings->video.smooth;
mip_level = 1;

22
gfx/video_shader_driver.c
View File

@ -90,13 +90,6 @@ unsigned video_shader_driver_get_prev_textures(void)
return current_shader->get_prev_textures(shader_data);
}
bool video_shader_driver_filter_type(unsigned index, bool *smooth)
{
if (!current_shader || !current_shader->filter_type)
return false;
return current_shader->filter_type(shader_data, index, smooth);
}
enum gfx_wrap_type video_shader_driver_wrap_type(unsigned index)
{
return current_shader->wrap_type(shader_data, index);
@ -125,7 +118,8 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
break;
case SHADER_CTL_SET_PARAMS:
{
video_shader_ctx_params_t *params = (video_shader_ctx_params_t*)data;
video_shader_ctx_params_t *params =
(video_shader_ctx_params_t*)data;
if (!current_shader || !current_shader->set_params)
return false;
@ -213,7 +207,8 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
break;
case SHADER_CTL_INFO:
{
video_shader_ctx_info_t *shader_info = (video_shader_ctx_info_t*)data;
video_shader_ctx_info_t *shader_info =
(video_shader_ctx_info_t*)data;
if (!shader_info || !current_shader)
return false;
@ -231,6 +226,15 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat
return false;
return current_shader->set_mvp(mvp->data, shader_data, mvp->matrix);
}
case SHADER_CTL_FILTER_TYPE:
{
video_shader_ctx_filter_t *filter =
(video_shader_ctx_filter_t*)data;
if (!current_shader || !current_shader->filter_type || !filter)
return false;
return current_shader->filter_type(shader_data,
filter->index, filter->smooth);
}
case SHADER_CTL_NONE:
default:
break;

11
gfx/video_shader_driver.h
View File

@ -66,7 +66,8 @@ enum video_shader_driver_ctl_state
SHADER_CTL_SET_COORDS,
SHADER_CTL_SCALE,
SHADER_CTL_INFO,
SHADER_CTL_SET_MVP
SHADER_CTL_SET_MVP,
SHADER_CTL_FILTER_TYPE
};
typedef struct shader_backend
@ -152,6 +153,12 @@ typedef struct video_shader_ctx_mvp
const math_matrix_4x4 *matrix;
} video_shader_ctx_mvp_t;
typedef struct video_shader_ctx_filter
{
unsigned index;
bool *smooth;
} video_shader_ctx_filter_t;
extern const shader_backend_t gl_glsl_backend;
extern const shader_backend_t hlsl_backend;
extern const shader_backend_t gl_cg_backend;
@ -175,8 +182,6 @@ const char *video_shader_driver_get_ident(void);
unsigned video_shader_driver_get_prev_textures(void);
bool video_shader_driver_filter_type(unsigned index, bool *smooth);
enum gfx_wrap_type video_shader_driver_wrap_type(unsigned index);
struct video_shader *video_shader_driver_direct_get_current_shader(void);