RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: minor simplification 

The parameter to default_tex_params() is always the same.
This commit is contained in:
wm4 2014-12-19 18:32:51 +01:00
parent fd6256f9c7
commit bebc323c6d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
video/out/gl_video.c
View File

@ -420,10 +420,10 @@ static const struct fmt_entry *find_tex_format(GL *gl, int bytes_per_comp,
return &fmts[n_channels - 1 + (bytes_per_comp - 1) * 4]; return &fmts[n_channels - 1 + (bytes_per_comp - 1) * 4];
} }
static void default_tex_params(struct GL *gl, GLenum target, GLint filter) static void default_tex_params(struct GL *gl, GLenum target)
{ {
gl->TexParameteri(target, GL_TEXTURE_MIN_FILTER, filter); gl->TexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
gl->TexParameteri(target, GL_TEXTURE_MAG_FILTER, filter); gl->TexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
gl->TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl->TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
gl->TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); gl->TexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
} }
@ -552,7 +552,7 @@ static bool fbotex_init(struct gl_video *p, struct fbotex *fbo, int w, int h,
gl->TexImage2D(p->gl_target, 0, iformat, gl->TexImage2D(p->gl_target, 0, iformat,
fbo->tex_w, fbo->tex_h, 0, fbo->tex_w, fbo->tex_h, 0,
GL_RGBA, GL_UNSIGNED_BYTE, NULL); GL_RGBA, GL_UNSIGNED_BYTE, NULL);
default_tex_params(gl, p->gl_target, GL_LINEAR); default_tex_params(gl, p->gl_target);
debug_check_gl(p, "after creating framebuffer texture"); debug_check_gl(p, "after creating framebuffer texture");
@ -1564,7 +1564,7 @@ static void init_video(struct gl_video *p, const struct mp_image_params *params)
plane->tex_w, plane->tex_h, 0, plane->tex_w, plane->tex_h, 0,
plane->gl_format, plane->gl_type, NULL); plane->gl_format, plane->gl_type, NULL);
default_tex_params(gl, p->gl_target, GL_LINEAR); default_tex_params(gl, p->gl_target);
} }
MP_VERBOSE(p, "Texture for plane %d: %dx%d\n", MP_VERBOSE(p, "Texture for plane %d: %dx%d\n",