xserver/hw/kdrive/ati ati_draw.c,1.15,1.16

[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 
Log Message:
- Pass the right pixel mask (all ones) in to PrepareSolid in the
  solid-fill-based composite acceleration.
- Use a real pixmap when doing an UploadToScratch (For pDrawable->type
  == DRAWABLE_WINDOW, you need to get the backing pixmap).
- Pass back the x/y offsets from kaaGetOffscreenPixmap
  unconditionally, because they'll be used in the scratch case.
- Turn on the Render acceleration for Rage 128 and Radeon 100-series at
  last!


Index: ati_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ati_draw.c	10 Jun 2004 09:50:59 -0000	1.15
+++ ati_draw.c	10 Jun 2004 19:22:56 -0000	1.16
@@ -753,12 +753,12 @@
 
 	/* We can't dispatch 3d commands in PIO mode. */
 	if (!atis->using_pio) {
-		if (0 && !atic->is_radeon) { /* XXX */
+		if (!atic->is_radeon) {
 			atis->kaa.CheckComposite = R128CheckComposite;
 			atis->kaa.PrepareComposite = R128PrepareComposite;
 			atis->kaa.Composite = R128Composite;
 			atis->kaa.DoneComposite = R128DoneComposite;
-		} else if (0 && atic->is_r100) { /* XXX */
+		} else if (atic->is_r100) {
 			atis->kaa.CheckComposite = R100CheckComposite;
 			atis->kaa.PrepareComposite = R100PrepareComposite;
 			atis->kaa.Composite = RadeonComposite;