[Xorg-commit] xc/lib/GL/mesa/src/drv/mga mgacontext.h,1.1.4.2,1.1.4.3 mgaioctl.c,1.1.4.2,1.1.4.3 mgatexmem.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

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


Index: mgacontext.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/mga/mgacontext.h,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/mgacontext.h	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ b/mgacontext.h	23 Feb 2004 21:34:04 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgacontext.h,v 1.11 2003/12/02 13:02:38 alanh Exp $*/
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgacontext.h,v 1.12 2004/01/23 19:09:31 dawes Exp $*/
 /*
  * Copyright 2000-2001 VA Linux Systems, Inc.
  * All Rights Reserved.
@@ -265,8 +264,8 @@
    GLuint vbl_seq;
    GLuint vblank_flags;
 
-   u_int64_t swap_ust;
-   u_int64_t swap_missed_ust;
+   int64_t swap_ust;
+   int64_t swap_missed_ust;
 
    GLuint swap_count;
    GLuint swap_missed_count;

Index: mgaioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/mga/mgaioctl.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/mgaioctl.c	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ b/mgaioctl.c	23 Feb 2004 21:34:04 -0000	1.1.4.3
@@ -25,8 +25,7 @@
  *    Keith Whitwell <keith at tungstengraphics.com>
  *    Gareth Hughes <gareth at valinux.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgaioctl.c,v 1.18 2003/12/02 13:02:38 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgaioctl.c,v 1.19 2004/01/23 03:57:05 dawes Exp $ */
 
 #include "mtypes.h"
 #include "macros.h"
@@ -588,7 +587,7 @@
 {
    if (MGA_DEBUG&DEBUG_VERBOSE_IOCTL)
       fprintf(stderr, "mgaGetIloadBuffer (buffer now %p)\n",
-	   mmesa->iload_buffer);
+	   (void *)mmesa->iload_buffer);
 
    mmesa->iload_buffer = mga_get_buffer_ioctl( mmesa );
 }

Index: mgatexmem.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/mga/mgatexmem.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/mgatexmem.c	6 Dec 2003 13:22:43 -0000	1.1.4.2
+++ b/mgatexmem.c	23 Feb 2004 21:34:04 -0000	1.1.4.3
@@ -24,8 +24,7 @@
  * Authors:
  *    Keith Whitwell <keith at tungstengraphics.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexmem.c,v 1.9 2003/12/02 13:02:38 alanh Exp $ */
-/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexmem.c,v 1.10 2004/01/23 03:57:05 dawes Exp $ */
 
 #include "glheader.h"
 
@@ -116,7 +115,7 @@
 
    if (texImage->Data == NULL) {
       fprintf(stderr, "null texture image data tObj %p level %d\n",
-	      t->base.tObj, level);
+	      (void *)t->base.tObj, level);
       return;
    }