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

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	sis_alloc.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: sis_alloc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/sis/sis_alloc.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
--- a/sis_alloc.c	20 Dec 2003 00:28:22 -0000	1.1.4.2
+++ b/sis_alloc.c	23 Feb 2004 21:34:13 -0000	1.1.4.3
@@ -24,8 +24,7 @@
 USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XdotOrg$ */
-/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c,v 1.10 2003/12/09 00:15:20 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_alloc.c,v 1.11 2003/12/22 17:48:03 tsi Exp $ */
 
 /*
  * Authors:
@@ -171,7 +170,7 @@
    memset( &smesa->zClearPacket, 0, sizeof(ENGPACKET) );
 
    smesa->zClearPacket.dwSrcPitch = (z_depth == 2) ? 0x80000000 : 0xf0000000;
-   smesa->zClearPacket.dwDestBaseAddr = (GLint)(addr -
+   smesa->zClearPacket.dwDestBaseAddr = (unsigned long)(addr -
       (unsigned long)smesa->FbBase);
    smesa->zClearPacket.wDestPitch = width2;
    smesa->zClearPacket.stdwDestPos.wY = 0;
@@ -219,7 +218,7 @@
    addr = (char *)ALIGNMENT( (unsigned long)addr, DRAW_BUFFER_HW_ALIGNMENT );
 
    smesa->backbuffer = addr;
-   smesa->backOffset = (GLint)(addr - (unsigned long)smesa->FbBase);
+   smesa->backOffset = (unsigned long)(addr - (unsigned long)smesa->FbBase);
    smesa->backPitch = width2 * depth;
 
    memset ( &smesa->cbClearPacket, 0, sizeof(ENGPACKET) );