[xserver-commit] xserver/hw/kdrive/ati ati_draw.c,1.8,1.9 radeon_composite.c,1.3,1.4

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory pdx:/home/anholt/xserver/hw/kdrive/ati

Modified Files:
	ati_draw.c radeon_composite.c 
Log Message:
- Correctly set the texture coordinate set source for the
  second texture unit.
- Re-enable Radeon's Composite accel now that fonts work
  again.


Index: ati_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ati_draw.c	3 Jan 2004 11:46:57 -0000	1.8
+++ ati_draw.c	4 Jan 2004 20:47:30 -0000	1.9
@@ -475,13 +475,12 @@
 			atis->kaa.Blend = R128BlendDMA;
 			atis->kaa.DoneBlend = R128DoneBlendDMA;
 		} else if (!atic->is_r200) {
-			/* XXX: This code is broken so far. */
-			/*atis->kaa.PrepareBlend = RadeonPrepareBlend;
+			atis->kaa.PrepareBlend = RadeonPrepareBlend;
 			atis->kaa.Blend = RadeonBlend;
 			atis->kaa.DoneBlend = RadeonDoneBlend;
 			atis->kaa.PrepareComposite = RadeonPrepareComposite;
 			atis->kaa.Composite = RadeonComposite;
-			atis->kaa.DoneComposite = RadeonDoneComposite;*/
+			atis->kaa.DoneComposite = RadeonDoneComposite;
 		}
 	} else {
 #else

Index: radeon_composite.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/radeon_composite.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- radeon_composite.c	3 Jan 2004 11:46:57 -0000	1.3
+++ radeon_composite.c	4 Jan 2004 20:47:30 -0000	1.4
@@ -133,6 +133,7 @@
 		txformat |= (ATILog2(h) - 1) << RADEON_TXFORMAT_HEIGHT_SHIFT;
 	} else 
 		txformat |= RADEON_TXFORMAT_NON_POWER2;
+	txformat |= unit << 24; /* RADEON_TXFORMAT_ST_ROUTE_STQX */
 
 	txpitch = pPix->devKind;
 	txoffset = ((CARD8 *)pPix->devPrivate.ptr -