Index: Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c	1 Jul 2004 11:35:53 -0000	1.3
+++ Mesa/src/mesa/drivers/dri/i915/i830_vtbl.c	31 Aug 2004 11:36:14 -0000	1.4
@@ -87,13 +87,13 @@
       intel->coloroffset = 3;
    }
 
-   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, VFT0_DIFFUSE );
+   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, VFT0_DIFFUSE );
       
    intel->specoffset = 0;
    if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) {
       if (index & _TNL_BIT_COLOR1) {
 	 intel->specoffset = intel->coloroffset + 1;
-	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, VFT0_SPEC );
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, VFT0_SPEC );
       }
       else 
 	 EMIT_PAD( 3 );
Index: Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c	18 Jun 2004 10:54:48 -0000	1.2
+++ Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c	31 Aug 2004 11:36:14 -0000	1.3
@@ -978,12 +978,12 @@
 
    if (inputsRead & FRAG_BIT_COL0) {
       intel->coloroffset = offset / 4;
-      EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, S4_VFMT_COLOR, 4 );
+      EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, S4_VFMT_COLOR, 4 );
    }
    
    if (inputsRead & FRAG_BIT_COL1) {
       intel->specoffset = offset / 4;
-      EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, S4_VFMT_SPEC_FOG, 3 );
+      EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, S4_VFMT_SPEC_FOG, 3 );
       EMIT_PAD( 1 );
    }
 
Index: Mesa/src/mesa/drivers/dri/i915/i915_texprog.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mesa/src/mesa/drivers/dri/i915/i915_texprog.c	18 Jun 2004 10:54:48 -0000	1.2
+++ Mesa/src/mesa/drivers/dri/i915/i915_texprog.c	31 Aug 2004 11:36:14 -0000	1.3
@@ -593,12 +593,12 @@
    }
       
    intel->coloroffset = offset / 4;
-   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_RGBA, S4_VFMT_COLOR, 4 );
+   EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4UB_4F_BGRA, S4_VFMT_COLOR, 4 );
             
    if (index & (_TNL_BIT_COLOR1|_TNL_BIT_FOG)) {
       if (index & _TNL_BIT_COLOR1) {
 	 intel->specoffset = offset / 4;
-	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_RGB, S4_VFMT_SPEC_FOG, 3 );
+	 EMIT_ATTR( _TNL_ATTRIB_COLOR1, EMIT_3UB_3F_BGR, S4_VFMT_SPEC_FOG, 3 );
       } else 
 	 EMIT_PAD( 3 );