From 08e53e971f1818cf4c2dd77cd91a91bc4ebf3075 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 6 Feb 2014 21:43:45 +1100 Subject: upload: restore default values for unpack_length fixes elements that upload a supplementary texture (glbumber, gldifferencematte, etc) --- gst-libs/gst/gl/gstglupload.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c index 08493d2..8143a70 100644 --- a/gst-libs/gst/gl/gstglupload.c +++ b/gst-libs/gst/gl/gstglupload.c @@ -1518,6 +1518,18 @@ _do_upload_fill (GstGLContext * context, GstGLUpload * upload) tex[i].format, tex[i].type, upload->data[data_i]); } + /* Reset to default values */ +#if GST_GL_HAVE_OPENGL || GST_GL_HAVE_GLES3 + if (USING_OPENGL (context) || USING_GLES3 (context)) { + gl->PixelStorei (GL_UNPACK_ROW_LENGTH, 0); + } +#endif +#if GST_GL_HAVE_GLES2 + if (USING_GLES2 (context)) { + gl->PixelStorei (GL_UNPACK_ALIGNMENT, 4); + } +#endif + /* make sure no texture is in use in our opengl context * in case we want to use the upload texture in an other opengl context */ -- cgit v1.2.3