diff options
| author | Niklas Haas <git@haasn.xyz> | 2017-07-18 01:09:11 +0200 |
|---|---|---|
| committer | Niklas Haas <git@haasn.xyz> | 2017-07-24 16:41:38 +0200 |
| commit | eb54d2ad4d46b6c1f91564604fad05f092772e84 (patch) | |
| tree | cff933bb2cee507e2a3fea778b5363671c42d6e4 /video/out/opengl/video.c | |
| parent | 38b367c0399e2e05c31c75b7caeda7d2129caf38 (diff) | |
| download | mpv-eb54d2ad4d46b6c1f91564604fad05f092772e84.tar.bz2 mpv-eb54d2ad4d46b6c1f91564604fad05f092772e84.tar.xz | |
vo_opengl: cut down on FBOTEX_FUZZY abuse
Don't use FBOTEX_FUZZY where the FBO is sized according to
p->texture_w/h, since this changes infrequently (and when it does, we
need to reset everything anyway). No real reason to make this change
other than that it possibly prevents nasty surprises in the future, so I
feel more comfortable about it.
Diffstat (limited to 'video/out/opengl/video.c')
| -rw-r--r-- | video/out/opengl/video.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 682825b6f9..65b1d95849 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -2052,8 +2052,7 @@ static void pass_read_video(struct gl_video *p) if (strcmp(conf->kernel.name, "bilinear") != 0) { GLSLF("// upscaling plane %d\n", n); pass_sample(p, tex[n], scaler, conf, 1.0, p->texture_w, p->texture_h); - finish_pass_fbo(p, &p->scale_fbo[n], p->texture_w, p->texture_h, - FBOTEX_FUZZY); + finish_pass_fbo(p, &p->scale_fbo[n], p->texture_w, p->texture_h, 0); tex[n] = img_tex_fbo(&p->scale_fbo[n], tex[n].type, tex[n].components); } @@ -2600,8 +2599,7 @@ static bool pass_render_frame(struct gl_video *p, struct mp_image *mpi, uint64_t pass_delinearize(p->sc, p->image_params.color.gamma); p->use_linear = false; } - finish_pass_fbo(p, &p->blend_subs_fbo, p->texture_w, p->texture_h, - FBOTEX_FUZZY); + finish_pass_fbo(p, &p->blend_subs_fbo, p->texture_w, p->texture_h, 0); pass_draw_osd(p, OSD_DRAW_SUB_ONLY, vpts, rect, p->texture_w, p->texture_h, p->blend_subs_fbo.fbo, false); pass_read_fbo(p, &p->blend_subs_fbo); |