summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2014-12-21 03:22:36 +1100
committerwm4 <wm4@nowhere>2014-12-21 21:39:45 +0100
commitec4bbbb69b83b781972ff4e81a8ea44d62b91c56 (patch)
treefe1f8a20f9810cc27a87ee9f58869c3ae6bb59a9
parentf6dac5d884bfea0aceba68715b720e80b2d9aa03 (diff)
downloadmpv-ec4bbbb69b83b781972ff4e81a8ea44d62b91c56.tar.bz2
mpv-ec4bbbb69b83b781972ff4e81a8ea44d62b91c56.tar.xz
vo_opengl: silence an INVALID_ENUM error with GLES2
Signed-off-by: wm4 <wm4@nowhere>
-rw-r--r--video/out/gl_video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 4fc9e3e28b..970681b38f 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -1930,7 +1930,8 @@ void gl_video_upload_image(struct gl_video *p, struct mp_image *mpi)
plane_ptr, mpi2.stride[n], 0, 0, plane->w, plane->h, 0);
}
gl->ActiveTexture(GL_TEXTURE0);
- gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+ if (pbo)
+ gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
p->have_image = true;
talloc_free(mpi);