Mercurial > mplayer.hg

changeset 36213:d05b680f78d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set GL_UNPACK_ROW_LENGTH even for GLES. This avoids issues with implementations like MESA that incorrectly do not ignore it.
author reimar
date Sun, 09 Jun 2013 10:09:41 +0000
parents a19b74774033
children fc128e175f72
files libvo/gl_common.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Sun Jun 09 09:46:20 2013 +0000
+++ b/libvo/gl_common.c	Sun Jun 09 10:09:41 2013 +0000
@@ -787,11 +787,10 @@
   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);