- Call appropriate Done function for Composite.

- Don't allow src transforms for Copy acceleration.
- Minor whitespace fixes.
This commit is contained in:
Eric Anholt 2004-01-03 21:52:14 +00:00
parent 3db761a17b
commit 9f1a92cd09

View File

@ -447,7 +447,7 @@ kaaTryDriverComposite(CARD8 op,
pbox++;
}
(*pKaaScr->info->DoneBlend) ();
(*pKaaScr->info->DoneComposite) ();
KdMarkSync(pDst->pDrawable->pScreen);
return 1;
}
@ -483,7 +483,8 @@ kaaComposite(CARD8 op,
if (ret == 1)
return;
}
else if (!pSrc->repeat && pSrc->format == pDst->format)
else if (!pSrc->repeat && !pSrc->transform &&
pSrc->format == pDst->format)
{
RegionRec region;
@ -509,8 +510,8 @@ kaaComposite(CARD8 op,
if (pScreenPriv->enabled && pKaaScr->info->PrepareBlend &&
!pSrc->alphaMap && !pDst->alphaMap)
{
ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst, width,
height);
ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst,
width, height);
if (ret == 1)
return;
}