summaryrefslogtreecommitdiffstats
path: root/video/out/gpu/video.c
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2020-05-13 18:54:30 +0200
committerNiklas Haas <git@haasn.xyz>2020-05-13 18:54:30 +0200
commit6d8b3f9333892e5bc282438995d457f1e05b0498 (patch)
tree325d1d1dae65f15a2ef594bf11da989f1d98b47f /video/out/gpu/video.c
parent0ff839d46742a0927752f6899688228b30df6a5f (diff)
downloadmpv-6d8b3f9333892e5bc282438995d457f1e05b0498.tar.bz2
mpv-6d8b3f9333892e5bc282438995d457f1e05b0498.tar.xz
vo_gpu: un-fix storable fbo format check
The original solution for #7017 was sort of a hack, but this hack is no longer needed because c05e5d9d 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 #7719, hopefully.
Diffstat (limited to 'video/out/gpu/video.c')
-rw-r--r--video/out/gpu/video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 7564c92eb7..1370436af2 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -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);