Move the bailing out due to ATIUploadToScreen() being unfinished up
farther, so that the traces aren't as confusing.
This commit is contained in:
parent
a973af4a9a
commit
0bd459488b
|
@ -568,6 +568,10 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
|
||||||
RING_LOCALS;
|
RING_LOCALS;
|
||||||
|
|
||||||
ENTER_DRAW (pDst);
|
ENTER_DRAW (pDst);
|
||||||
|
|
||||||
|
LEAVE_DRAW (pDst);
|
||||||
|
/* XXX: Hostdata uploads aren't working yet. */
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
dst_offset = ((CARD8 *)pDst->devPrivate.ptr -
|
dst_offset = ((CARD8 *)pDst->devPrivate.ptr -
|
||||||
pScreenPriv->screen->memory_base);
|
pScreenPriv->screen->memory_base);
|
||||||
|
@ -595,11 +599,6 @@ ATIUploadToScreen(PixmapPtr pDst, char *src, int src_pitch)
|
||||||
if (atis->using_pio)
|
if (atis->using_pio)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
LEAVE_DRAW (pDst);
|
|
||||||
|
|
||||||
/* XXX: Hostdata uploads aren't working yet. */
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
dwords = (width * height * (bpp / 8) + 3) / 4;
|
dwords = (width * height * (bpp / 8) + 3) / 4;
|
||||||
|
|
||||||
/* Flush pixel cache so nothing being written to the destination
|
/* Flush pixel cache so nothing being written to the destination
|
||||||
|
|
Loading…
Reference in New Issue