xserver/hw/kdrive/ati ati_draw.c,1.30,1.31

Committed by: anholt

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

Modified Files:
	ati_draw.c 
Log Message:
Move the bailing out due to ATIUploadToScreen() being unfinished up farther, so
that the traces aren't as confusing.


Index: ati_draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ati_draw.c	25 Jan 2005 06:04:21 -0000	1.30
+++ ati_draw.c	27 Jan 2005 03:52:49 -0000	1.31
@@ -568,6 +568,10 @@
 	RING_LOCALS;
 
 	ENTER_DRAW (pDst);
+
+	LEAVE_DRAW (pDst);
+	/* XXX: Hostdata uploads aren't working yet. */
+	return FALSE;
 	
 	dst_offset = ((CARD8 *)pDst->devPrivate.ptr -
 	    pScreenPriv->screen->memory_base);
@@ -595,11 +599,6 @@
 	if (atis->using_pio)
 		return FALSE;
 
-	LEAVE_DRAW (pDst);
-
-	/* XXX: Hostdata uploads aren't working yet. */
-	return FALSE;
-
 	dwords = (width * height * (bpp / 8) + 3) / 4;
 
 	/* Flush pixel cache so nothing being written to the destination