andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Call appropriate Done function for Composite.

Browse Source 
- 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
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/kdrive/src/kaapict.c
View File

@ -104,9 +104,9 @@ kaaPrintCompositeFallback(CARD8 op,
kaaCompositeFallbackPictDesc(pDst, dstdesc, 40); kaaCompositeFallbackPictDesc(pDst, dstdesc, 40);
ErrorF("Composite fallback: op %s, \n" ErrorF("Composite fallback: op %s, \n"
" src %s, \n" " src %s, \n"
" mask %s, \n" " mask %s, \n"
" dst %s, \n", " dst %s, \n",
sop, srcdesc, maskdesc, dstdesc); sop, srcdesc, maskdesc, dstdesc);
} }
#endif #endif
@ -447,7 +447,7 @@ kaaTryDriverComposite(CARD8 op,
pbox++; pbox++;
} }
(*pKaaScr->info->DoneBlend) (); (*pKaaScr->info->DoneComposite) ();
KdMarkSync(pDst->pDrawable->pScreen); KdMarkSync(pDst->pDrawable->pScreen);
return 1; return 1;
} }
@ -483,7 +483,8 @@ kaaComposite(CARD8 op,
if (ret == 1) if (ret == 1)
return; return;
} }
else if (!pSrc->repeat && pSrc->format == pDst->format) else if (!pSrc->repeat && !pSrc->transform &&
pSrc->format == pDst->format)
{ {
RegionRec region; RegionRec region;
@ -509,10 +510,10 @@ kaaComposite(CARD8 op,
if (pScreenPriv->enabled && pKaaScr->info->PrepareBlend && if (pScreenPriv->enabled && pKaaScr->info->PrepareBlend &&
!pSrc->alphaMap && !pDst->alphaMap) !pSrc->alphaMap && !pDst->alphaMap)
{ {
ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst, width, ret = kaaTryDriverBlend(op, pSrc, pDst, xSrc, ySrc, xDst, yDst,
height); width, height);
if (ret == 1) if (ret == 1)
return; return;
} }
} }