[Xorg-commit] xc/lib/GL/mesa/src/drv/i830 i830_texstate.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/GL/mesa/src/drv/i830
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/drv/i830

Modified Files:
      Tag: XORG-CURRENT
	i830_texstate.c 
Log Message:
fix bad merge (and test commit email)


Index: i830_texstate.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/i830/i830_texstate.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- i830_texstate.c	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ i830_texstate.c	6 Dec 2003 17:27:08 -0000	1.1.4.3
@@ -26,7 +26,6 @@
 **************************************************************************/
 
 /* $XFree86: xc/lib/GL/mesa/src/drv/i830/i830_texstate.c,v 1.5 2003/12/02 13:02:37 alanh Exp $ */
-/* $XdotOrg$ */
 
 /*
  * Author:
@@ -148,8 +147,19 @@
    /* All images must be loaded at this pitch.  Count the number of
     * lines required:
     */
-      (((tObj->Image[firstLevel]->Height - 1) << TM0S1_HEIGHT_SHIFT) |
-       ((tObj->Image[firstLevel]->Width - 1) << TM0S1_WIDTH_SHIFT) |
+   for ( total_height = i = 0 ; i < numLevels ; i++ ) {
+      t->image[0][i].image = tObj->Image[t->base.firstLevel + i];
+      if (!t->image[0][i].image) 
+	 break;
+      
+      t->image[0][i].offset = total_height * pitch;
+      t->image[0][i].internalFormat = baseImage->Format;
+      total_height += t->image[0][i].image->Height;
+   }
+
+   t->Pitch = pitch;
+   t->base.totalSize = total_height*pitch;
+   t->Setup[I830_TEXREG_TM0S1] = 
       (((tObj->Image[t->base.firstLevel]->Height - 1) << TM0S1_HEIGHT_SHIFT) |
        ((tObj->Image[t->base.firstLevel]->Width - 1) << TM0S1_WIDTH_SHIFT) |
        textureFormat);