From ff4004f3fbd3c576f1c931c680ad293c5038846d Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 17 Jun 2007 22:24:46 -0400 Subject: [PATCH] Rename fbCompositeSrc_x888x8x8888 to x888xnx8888 --- pixman/pixman-mmx.c | 2 +- pixman/pixman-mmx.h | 2 +- pixman/pixman-pict.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index 1001cff..8025150 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -1271,7 +1271,7 @@ fbCompositeSrc_8888x8x8888mmx (pixman_op_t op, } void -fbCompositeSrc_x888x8x8888mmx (pixman_op_t op, +fbCompositeSrc_x888xnx8888mmx (pixman_op_t op, pixman_image_t * pSrc, pixman_image_t * pMask, pixman_image_t * pDst, diff --git a/pixman/pixman-mmx.h b/pixman/pixman-mmx.h index 6b86fdc..c666f43 100644 --- a/pixman/pixman-mmx.h +++ b/pixman/pixman-mmx.h @@ -118,7 +118,7 @@ fbCompositeSolidMaskSrc_nx8x8888mmx (pixman_op_t op, uint16_t width, uint16_t height); void -fbCompositeSrc_x888x8x8888mmx (pixman_op_t op, +fbCompositeSrc_x888xnx8888mmx (pixman_op_t op, pixman_image_t * pSrc, pixman_image_t * pMask, pixman_image_t * pDst, diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c index 201dc91..b520014 100644 --- a/pixman/pixman-pict.c +++ b/pixman/pixman-pict.c @@ -1374,13 +1374,13 @@ pixman_image_composite (pixman_op_t op, if ((pDst->bits.format == PIXMAN_a8r8g8b8 || pDst->bits.format == PIXMAN_x8r8g8b8) && pMask->bits.format == PIXMAN_a8 && pixman_have_mmx()) - func = fbCompositeSrc_x888x8x8888mmx; + func = fbCompositeSrc_x888xnx8888mmx; break; case PIXMAN_x8b8g8r8: if ((pDst->bits.format == PIXMAN_a8b8g8r8 || pDst->bits.format == PIXMAN_x8b8g8r8) && pMask->bits.format == PIXMAN_a8 && pixman_have_mmx()) - func = fbCompositeSrc_x888x8x8888mmx; + func = fbCompositeSrc_x888xnx8888mmx; break; case PIXMAN_a8r8g8b8: if ((pDst->bits.format == PIXMAN_a8r8g8b8 || -- 2.7.4