[Xorg-commit] xc/lib/GL/mesa/src/drv/radeon radeon_context.c,1.1.4.1,1.1.4.2 radeon_ioctl.c,1.1.4.2,1.1.4.3 radeon_screen.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	radeon_context.c radeon_ioctl.c radeon_screen.c 
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch

Index: radeon_context.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- radeon_context.c	26 Nov 2003 22:48:33 -0000	1.1.4.1
+++ radeon_context.c	20 Dec 2003 00:28:22 -0000	1.1.4.2
@@ -1,4 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v 1.10 2003/09/28 20:15:27 alanh Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v 1.11 2003/12/08 22:45:30 alanh Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -486,12 +487,12 @@
           */
          int i;
 
-	 assert( is_empty_list( & rmesa->swapped ) );
-
          for ( i = 0 ; i < rmesa->nr_heaps ; i++ ) {
 	    driDestroyTextureHeap( rmesa->texture_heaps[ i ] );
 	    rmesa->texture_heaps[ i ] = NULL;
          }
+
+	 assert( is_empty_list( & rmesa->swapped ) );
       }
 
       FREE( rmesa );

Index: radeon_ioctl.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.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
--- radeon_ioctl.c	6 Dec 2003 13:24:21 -0000	1.1.4.2
+++ radeon_ioctl.c	20 Dec 2003 00:28:22 -0000	1.1.4.3
@@ -1,5 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c,v 1.13 2003/12/02 13:02:39 alanh Exp $ */
 /* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_ioctl.c,v 1.14 2003/12/18 21:56:37 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -47,6 +47,7 @@
 #include "radeon_tcl.h"
 #include "radeon_sanity.h"
 
+#define STANDALONE_MMIO
 #include "radeon_macros.h"  /* for INREG() */
 
 #include "vblank.h"
@@ -716,12 +717,10 @@
    else
       ret = -EINVAL;
 
-#ifndef __alpha__
    if ( ret == -EINVAL ) {
       frame = INREG( RADEON_LAST_FRAME_REG );
       ret = 0;
    } 
-#endif
    if ( ret ) {
       fprintf( stderr, "%s: drmRadeonGetParam: %d\n", __FUNCTION__, ret );
       exit(1);
@@ -1009,12 +1008,10 @@
       } else
 	ret = -EINVAL;
 
-#ifndef __alpha__
       if ( ret == -EINVAL ) {
 	 clear = INREG( RADEON_LAST_CLEAR_REG );
 	 ret = 0;
       }
-#endif
       if ( ret ) {
 	 fprintf( stderr, "%s: drmRadeonGetParam: %d\n", __FUNCTION__, ret );
 	 exit(1);

Index: radeon_screen.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/radeon/radeon_screen.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
--- radeon_screen.c	6 Dec 2003 13:24:21 -0000	1.1.4.2
+++ radeon_screen.c	20 Dec 2003 00:28:22 -0000	1.1.4.3
@@ -1,5 +1,5 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c,v 1.9 2003/12/02 13:02:39 alanh Exp $ */
 /* $XdotOrg$ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c,v 1.10 2003/12/18 21:56:37 dawes Exp $ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -39,6 +39,7 @@
 #include "glheader.h"
 #include "imports.h"
 
+#define STANDALONE_MMIO
 #include "radeon_context.h"
 #include "radeon_screen.h"
 #include "radeon_macros.h"