Bug #5796: Wrong fastpath selection for repeating sources.

This commit is contained in:
Matthias Hopf 2006-05-11 11:23:43 +00:00
parent 9db5d2dfc3
commit 9e239a0df7
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2006-05-11 Matthias Hopf <mhopf@suse.de>
* fb/fbpict.c: (fbComposite):
Bug #5796: Wrong fastpath selection for repeating sources.
2006-05-11 Matthias Hopf <mhopf@suse.de>
* hw/xfree86/xaa/xaaPict.c: (XAAComposite):

View File

@ -844,7 +844,7 @@ fbComposite (CARD8 op,
int n;
BoxPtr pbox;
CompositeFunc func = NULL;
Bool srcRepeat = pSrc->pDrawable && pSrc->repeat == RepeatNormal;
Bool srcRepeat = pSrc->pDrawable && pSrc->repeat;
Bool maskRepeat = FALSE;
Bool srcAlphaMap = pSrc->alphaMap != 0;
Bool maskAlphaMap = FALSE;
@ -990,7 +990,7 @@ fbComposite (CARD8 op,
}
}
}
else /* has mask and non-repeating source */
else if (! srcRepeat) /* has mask and non-repeating source */
{
if (pSrc->pDrawable == pMask->pDrawable &&
xSrc == xMask && ySrc == yMask &&
@ -1098,7 +1098,7 @@ fbComposite (CARD8 op,
break;
}
}
else
else if (! srcRepeat)
{
switch (pSrc->format) {
case PICT_a8r8g8b8: