[MPlayer-cvslog] r36309 - trunk/libvo/gl_common.c

[reimar]

Author: reimar
Date: Sun Jun  9 12:09:41 2013
New Revision: 36309

Log:
Set GL_UNPACK_ROW_LENGTH even for GLES.

This avoids issues with implementations like MESA that
incorrectly do not ignore it.

Modified:
   trunk/libvo/gl_common.c

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	Sun Jun  9 11:46:20 2013	(r36308)
+++ trunk/libvo/gl_common.c	Sun Jun  9 12:09:41 2013	(r36309)
@@ -787,11 +787,10 @@ void glUploadTex(GLenum target, GLenum f
   if (!mpglBegin) {
     // we have to copy line-by-line for GLES
     if (stride != w*bpp) slice = 1;
-  } else {
-    // this is not always correct, but should work for MPlayer
-    glAdjustAlignment(stride);
-    mpglPixelStorei(GL_UNPACK_ROW_LENGTH, stride / bpp);
   }
+  // this is not always correct, but should work for MPlayer
+  glAdjustAlignment(stride);
+  mpglPixelStorei(GL_UNPACK_ROW_LENGTH, stride / bpp);
   if (slice < 0) {
     mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
     mpglTexImage2D(target, 0, GL_RGB, w, h, 0, format, type, data);