Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,

    with the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
    insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least
    could probably use some checking at this point.

1 files changed, 15 insertions, 14 deletions

diff --git a/src/radeon_common.h b/src/radeon_common.h
index bf11863..994f5bb 100644
--- a/src/radeon_common.h
+++ b/src/radeon_common.h
@@ -31,7 +31,8 @@
  * Converted to common header format:
  *   Jens Owen <jens@tungstengraphics.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.2 2003/04/07 01:22:09 martin Exp $
+ * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.2 2004/04/23 19:26:46 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8tsi Exp $
  *
  */
 
@@ -172,7 +173,7 @@ typedef struct {
 
 #define RADEON_MAX_TEXTURE_UNITS 3
 
-/* Layout matches drm_radeon_state_t in linux drm_radeon.h.  
+/* Layout matches drm_radeon_state_t in linux drm_radeon.h.
  */
 typedef struct {
 	struct {
@@ -235,7 +236,7 @@ typedef struct {
 		unsigned int pp_border_color;
 	} texture[RADEON_MAX_TEXTURE_UNITS];
 	struct {
-		unsigned int se_zbias_factor; 
+		unsigned int se_zbias_factor;
 		unsigned int se_zbias_constant;
 	} zbias;
 	unsigned int dirty;
@@ -378,23 +379,23 @@ typedef struct {
 
 typedef union {
 	int i;
-	struct { 
+	struct {
 	   unsigned char cmd_type, pad0, pad1, pad2;
 	} header;
-	struct { 
+	struct {
 	   unsigned char cmd_type, packet_id, pad0, pad1;
 	} packet;
-	struct { 
-	   unsigned char cmd_type, offset, stride, count; 
+	struct {
+	   unsigned char cmd_type, offset, stride, count;
 	} scalars;
-	struct { 
-	   unsigned char cmd_type, offset, stride, count; 
+	struct {
+	   unsigned char cmd_type, offset, stride, count;
 	} vectors;
-	struct { 
-	   unsigned char cmd_type, buf_idx, pad0, pad1; 
+	struct {
+	   unsigned char cmd_type, buf_idx, pad0, pad1;
 	} dma;
-	struct { 
-	   unsigned char cmd_type, flags, pad0, pad1; 
+	struct {
+	   unsigned char cmd_type, flags, pad0, pad1;
 	} wait;
 } drmRadeonCmdHeader;
 
@@ -444,7 +445,7 @@ typedef struct drm_radeon_mem_free {
 typedef struct drm_radeon_mem_init_heap {
 	int region;
 	int size;
-	int start;	
+	int start;
 } drmRadeonMemInitHeap;
 
 /* 1.6: Userspace can request & wait on irq's: