[MPlayer-cvslog] CVS: main/libvo vo_gl2.c,1.71,1.72

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv5173/libvo

Modified Files:
	vo_gl2.c 
Log Message:
use glUploadTex helper function


Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_gl2.c	14 Aug 2005 19:36:34 -0000	1.71
+++ vo_gl2.c	14 Aug 2005 19:40:33 -0000	1.72
@@ -229,7 +229,7 @@
       tsq->fw = texpercx;
       tsq->fh = texpercy;
 
-      tsq->isDirty=GL_TRUE;
+      tsq->isDirty=GL_FALSE;
       tsq->isTexture=GL_FALSE;
       tsq->texobj=0;
       tsq->dirtyXoff=0; tsq->dirtyYoff=0; tsq->dirtyWidth=-1; tsq->dirtyHeight=-1;
@@ -469,10 +469,11 @@
 
       if(square->isDirty)
       {
-	glTexSubImage2D (GL_TEXTURE_2D, 0, 
+	glUploadTex(GL_TEXTURE_2D, gl_bitmap_format,  gl_bitmap_type,
+		 square->texture, image_width * image_bytes,
 		 square->dirtyXoff, square->dirtyYoff,
 		 square->dirtyWidth, square->dirtyHeight,
-		 gl_bitmap_format, gl_bitmap_type, square->texture);
+		 0);
 
         square->isDirty=GL_FALSE;
         square->dirtyXoff=0; square->dirtyYoff=0; square->dirtyWidth=-1; square->dirtyHeight=-1;
@@ -709,15 +710,6 @@
   glDisable(GL_DEPTH_TEST);
   glDepthMask(GL_FALSE);
   glDisable(GL_CULL_FACE);
-
-  glPixelStorei (GL_UNPACK_ROW_LENGTH, image_width);
-
-  /**
-   * may give a little speed up for a kinda burst read ..
-   * Also, the default of 4 will break some files.
-   */
-  glAdjustAlignment(image_width*image_bytes);
-
   glEnable (GL_TEXTURE_2D);
 
   gl_set_antialias(0);