summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorMatthias Hopf <mhopf@suse.de>2006-05-11 11:23:43 +0000
committerMatthias Hopf <mhopf@suse.de>2006-05-11 11:23:43 +0000
commit9e239a0df7ededb50de091e5271cbfddd2b683c3 (patch)
treee858340804f6a1a9fbaa0ec5e05a28f9c93a8d5e /fb
parent9db5d2dfc33e384ea4db1b7cbc377e0b05cfb3ff (diff)
Bug #5796: Wrong fastpath selection for repeating sources.
Diffstat (limited to 'fb')
-rw-r--r--fb/fbpict.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 591ddffe3..f248fdb84 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -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: