Skip to content

Commit

Permalink
vo_gpu: un-fix storable fbo format check
Browse files Browse the repository at this point in the history
The original solution for mpv-player#7017 was sort of a hack, but this hack is no
longer needed because c05e5d9 fixed the underlying issue causing this
error to be spammed in the first place. So just remove the "fix" that
apparently introduced about as many issueas it fixed.

Fixes mpv-player#7719, hopefully.
  • Loading branch information
haasn committed May 13, 2020
1 parent 0ff839d commit 6d8b3f9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions video/out/gpu/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -3302,8 +3302,7 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame,
const struct ra_format *fmt = fbo.tex->params.format;
if (fmt->dummy_format)
fmt = p->fbo_format;
if (!fmt->storable && p->fbo_format->storable)
fmt = p->fbo_format; // to be on the safe side

bool r = ra_tex_resize(p->ra, p->log, &p->output_tex,
fbo.tex->params.w, fbo.tex->params.h,
fmt);
Expand Down

0 comments on commit 6d8b3f9

Please sign in to comment.