xserver/hw/kdrive/ati ati_draw.c, 1.25, 1.26 radeon_composite.c, 1.12, 1.13

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/ati
In directory gabe:/tmp/cvs-serv18843/hw/kdrive/ati

Modified Files:
	ati_draw.c radeon_composite.c 
Log Message:
Fix r200 render (for real this time?) by setting tex1_comp_cnt right for
non-mask rendering.  Reenable it.  Also, R200TexFormats was used instead
of R100 in one place.  Harmless so far, because the formats were in the
same order.


Index: ati_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ati_draw.c	20 Sep 2004 03:12:00 -0000	1.25
+++ ati_draw.c	21 Dec 2004 09:51:47 -0000	1.26
@@ -777,7 +777,7 @@
 			atis->kaa.PrepareComposite = R100PrepareComposite;
 			atis->kaa.Composite = RadeonComposite;
 			atis->kaa.DoneComposite = RadeonDoneComposite;
-		} else if (0 && atic->is_r200) { /* XXX */
+		} else if (atic->is_r200) {
 			atis->kaa.CheckComposite = R200CheckComposite;
 			atis->kaa.PrepareComposite = R200PrepareComposite;
 			atis->kaa.Composite = RadeonComposite;

Index: radeon_composite.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/radeon_composite.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- radeon_composite.c	20 Sep 2004 03:12:00 -0000	1.12
+++ radeon_composite.c	21 Dec 2004 09:51:47 -0000	1.13
@@ -384,6 +384,7 @@
 
 	return TRUE;
 }
+
 static Bool
 R200TextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit)
 {
@@ -405,7 +406,7 @@
 			break;
 	}
 	txformat = R200TexFormats[i].card_fmt;
-	if (R100TexFormats[i].byte_swap)
+	if (R200TexFormats[i].byte_swap)
 		txoffset |= RADEON_TXO_ENDIAN_BYTE_SWAP;
 
 	if (pPict->repeat) {
@@ -527,7 +528,7 @@
 	OUT_REG(R200_REG_SE_VTX_FMT_0, R200_VTX_XY);
 	OUT_REG(R200_REG_SE_VTX_FMT_1,
 	    (2 << R200_VTX_TEX0_COMP_CNT_SHIFT) |
-	    (2 << R200_VTX_TEX1_COMP_CNT_SHIFT));
+	    (pMask != NULL) ? (2 << R200_VTX_TEX1_COMP_CNT_SHIFT) : 0);
 
 	OUT_REG(RADEON_REG_RB3D_COLORPITCH, dst_pitch >> pixel_shift);