diff options
author | Niklas Haas <git@haasn.xyz> | 2017-07-25 06:31:34 +0200 |
---|---|---|
committer | Niklas Haas <git@haasn.xyz> | 2017-07-25 06:32:29 +0200 |
commit | 62de84cbe3b060792a7d19cf747a8ba5a697e894 (patch) | |
tree | 0d385ad7e84df2d5f2dce7294421095961d1ee87 /video/out/opengl/video.c | |
parent | d099e037efa2ceaff96c775f5c6f8d1e74650b76 (diff) | |
download | mpv-62de84cbe3b060792a7d19cf747a8ba5a697e894.tar.bz2 mpv-62de84cbe3b060792a7d19cf747a8ba5a697e894.tar.xz |
vo_opengl: kill off FBOTEX_COMPUTE again
The textures not having an FBO actually caused regressions when trying
to render the subtitles on top of this texture (--blend-subtitles),
which still relied on an FBO.
So just kill off the logic entirely. Why worry about a single FBO wasted
when we're allocating like 10 anyway.
Fixes #4657.
Diffstat (limited to 'video/out/opengl/video.c')
-rw-r--r-- | video/out/opengl/video.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index d1edfa02fb..949c74b0fe 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -1263,13 +1263,9 @@ static void finish_pass_direct(struct gl_video *p, GLint fbo, int vp_w, int vp_h static void finish_pass_fbo(struct gl_video *p, struct fbotex *dst_fbo, int w, int h, int flags) { - bool use_compute = p->compute_w > 0 && p->compute_h > 0; - if (use_compute) - flags |= FBOTEX_COMPUTE; - fbotex_change(dst_fbo, p->gl, p->log, w, h, p->opts.fbo_format, flags); - if (use_compute) { + if (p->compute_w > 0 && p->compute_h > 0) { gl_sc_uniform_image2D(p->sc, "out_image", dst_fbo->texture, dst_fbo->iformat, GL_WRITE_ONLY); GLSL(imageStore(out_image, ivec2(gl_GlobalInvocationID), color);) |