From 0e4292666de736a584a3d4e0bcfc6db7d2c6538d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 17 Jun 2007 23:10:23 -0400 Subject: [PATCH] Also use this function in the xBGR case --- pixman/pixman-pict.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c index bd4c1f1..5e13529 100644 --- a/pixman/pixman-pict.c +++ b/pixman/pixman-pict.c @@ -1465,17 +1465,22 @@ pixman_image_composite (pixman_op_t op, } else { - if (pSrc->bits.format == PIXMAN_x8r8g8b8 && - pMask->bits.format == PIXMAN_a8 && - (pDst->bits.format == PIXMAN_a8r8g8b8 || - pDst->bits.format == PIXMAN_x8r8g8b8)) + if (pMask->bits.format == PIXMAN_a8) { + if ((pSrc->bits.format == PIXMAN_x8r8g8b8 && + (pDst->bits.format == PIXMAN_x8r8g8b8 || + pDst->bits.format == PIXMAN_a8r8g8b8)) || + (pSrc->bits.format == PIXMAN_x8b8g8r8 && + (pDst->bits.format == PIXMAN_x8b8g8r8 || + pDst->bits.format == PIXMAN_a8b8g8r8))) + { #ifdef USE_MMX - if (pixman_have_mmx()) - func = fbCompositeOver_x888x8x8888mmx; - else + if (pixman_have_mmx()) + func = fbCompositeOver_x888x8x8888mmx; + else #endif - func = fbCompositeOver_x888x8x8888; + func = fbCompositeOver_x888x8x8888; + } } } } -- 2.7.4