Commit 9f1a92cd authored by Eric Anholt's avatar Eric Anholt

- Call appropriate Done function for Composite.

- Don't allow src transforms for Copy acceleration.
- Minor whitespace fixes.
parent 3db761a1
......@@ -104,9 +104,9 @@ kaaPrintCompositeFallback(CARD8 op,
kaaCompositeFallbackPictDesc(pDst, dstdesc, 40);
ErrorF("Composite fallback: op %s, \n"
" src %s, \n"
" mask %s, \n"
" dst %s, \n",
" src %s, \n"
" mask %s, \n"
" dst %s, \n",
sop, srcdesc, maskdesc, dstdesc);
}
#endif
......@@ -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,10 +510,10 @@ kaaComposite(CARD8 op,
if (pScreenPriv->enabled && pKaaScr->info->PrepareBlend &&
!pSrc->alphaMap && !pDst->alphaMap)
{
ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst, width,
height);
if (ret == 1)
return;
ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst,
width, height);
if (ret == 1)
return;
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment