From 1c5774bf6d39e7b349c03866c96811ee1754c9d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 29 Jun 2009 07:35:40 -0400 Subject: [PATCH] Get rid of pFoo names. s/([^o])pSrc/$1src_image/g; s/([^o])pDst/$1dst_image/g; s/([^o])pMask/$1mask_image/g; s/pRegion/region/g; s/pNextRect/next_rect/g; --- pixman/pixman-arm-neon.c | 114 ++++++++++----------- pixman/pixman-arm-simd.c | 44 ++++---- pixman/pixman-fast-path.c | 212 +++++++++++++++++++-------------------- pixman/pixman-mmx.c | 248 +++++++++++++++++++++++----------------------- pixman/pixman-private.h | 6 +- pixman/pixman-region.c | 48 ++++----- pixman/pixman-sse2.c | 238 ++++++++++++++++++++++---------------------- pixman/pixman-utils.c | 176 ++++++++++++++++---------------- pixman/pixman-vmx.c | 20 ++-- pixman/pixman.c | 8 +- pixman/pixman.h | 8 +- 11 files changed, 561 insertions(+), 561 deletions(-) diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c index 6b14750..dcc0495 100644 --- a/pixman/pixman-arm-neon.c +++ b/pixman/pixman-arm-neon.c @@ -127,9 +127,9 @@ static void neon_CompositeAdd_8000_8000 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -144,8 +144,8 @@ neon_CompositeAdd_8000_8000 ( int dstStride, srcStride; uint16_t w; - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); if (width>=8) { @@ -277,9 +277,9 @@ static void neon_composite_over_8888_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -294,8 +294,8 @@ neon_composite_over_8888_8888 ( int dstStride, srcStride; uint32_t w; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); if (width>=8) { @@ -438,9 +438,9 @@ static void neon_composite_over_8888_n_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -457,10 +457,10 @@ neon_composite_over_8888_n_8888 ( uint32_t w; uint8x8_t mask_alpha; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask_alpha = vdup_n_u8((mask) >> 24); if (width>=8) @@ -635,9 +635,9 @@ static void neon_CompositeOver_n_8_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -657,7 +657,7 @@ neon_CompositeOver_n_8_8888 ( uint8x8_t mask_selector=vreinterpret_u8_u64(vcreate_u64(0x0101010100000000ULL)); uint8x8_t alpha_selector=vreinterpret_u8_u64(vcreate_u64(0x0707070703030303ULL)); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); // bail out if fully transparent srca = src >> 24; @@ -670,8 +670,8 @@ neon_CompositeOver_n_8_8888 ( sval8.val[2]=vdup_lane_u8(sval2,2); sval8.val[3]=vdup_lane_u8(sval2,3); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); if (width>=8) { @@ -842,9 +842,9 @@ static void neon_CompositeAdd_8888_8_8 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -861,9 +861,9 @@ neon_CompositeAdd_8888_8_8 ( uint32_t src; uint8x8_t sa; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid (pSrc, pDst->bits.format); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); + src = _pixman_image_get_solid (src_image, dst_image->bits.format); sa = vdup_n_u8((src) >> 24); if (width>=8) @@ -961,9 +961,9 @@ static void neon_CompositeSrc_16_16 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -980,8 +980,8 @@ neon_CompositeSrc_16_16 ( return; /* We simply copy 16-bit-aligned pixels from one place to another. */ - fbComposeGetStart (pSrc, xSrc, ySrc, uint16_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint16_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); /* Preload the first input scanline */ { @@ -1088,9 +1088,9 @@ static void neon_CompositeSrc_24_16 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1108,8 +1108,8 @@ neon_CompositeSrc_24_16 ( return; /* We simply copy pixels from one place to another, assuming that the source's alpha is opaque. */ - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); /* Preload the first input scanline */ { @@ -1715,9 +1715,9 @@ static void neon_CompositeOver_n_8_0565 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1734,7 +1734,7 @@ neon_CompositeOver_n_8_0565 ( uint32_t kernelCount, copyCount, copyTail; uint8_t kernelOffset, copyOffset; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); // bail out if fully transparent or degenerate srca = src >> 24; @@ -1748,14 +1748,14 @@ neon_CompositeOver_n_8_0565 ( // TODO: there must be a more elegant way of doing this. int x; for(x=0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS) { - neon_CompositeOver_n_8_0565(impl, op, pSrc, pMask, pDst, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, + neon_CompositeOver_n_8_0565(impl, op, src_image, mask_image, dst_image, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, (x+NEON_SCANLINE_BUFFER_PIXELS > width) ? width-x : NEON_SCANLINE_BUFFER_PIXELS, height); } return; } - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); // keep within minimum number of aligned quadwords on width // while also keeping the minimum number of columns to process @@ -1870,9 +1870,9 @@ static void neon_CompositeOver_n_0565 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1888,7 +1888,7 @@ neon_CompositeOver_n_0565 ( uint32_t kernelCount, copyCount, copyTail; uint8_t kernelOffset, copyOffset; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); // bail out if fully transparent srca = src >> 24; @@ -1902,13 +1902,13 @@ neon_CompositeOver_n_0565 ( // TODO: there must be a more elegant way of doing this. int x; for(x=0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS) { - neon_CompositeOver_n_0565(impl, op, pSrc, pMask, pDst, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, + neon_CompositeOver_n_0565(impl, op, src_image, mask_image, dst_image, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, (x+NEON_SCANLINE_BUFFER_PIXELS > width) ? width-x : NEON_SCANLINE_BUFFER_PIXELS, height); } return; } - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); // keep within minimum number of aligned quadwords on width // while also keeping the minimum number of columns to process @@ -2013,9 +2013,9 @@ static void neon_CompositeOver_8888_0565 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2038,14 +2038,14 @@ neon_CompositeOver_8888_0565 ( // split the blit, so we can use a fixed-size scanline buffer int x; for(x=0; x < width; x += NEON_SCANLINE_BUFFER_PIXELS) { - neon_CompositeOver_8888_0565(impl, op, pSrc, pMask, pDst, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, + neon_CompositeOver_8888_0565(impl, op, src_image, mask_image, dst_image, xSrc+x, ySrc, xMask+x, yMask, xDst+x, yDst, (x+NEON_SCANLINE_BUFFER_PIXELS > width) ? width-x : NEON_SCANLINE_BUFFER_PIXELS, height); } return; } - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); // keep within minimum number of aligned quadwords on width // while also keeping the minimum number of columns to process diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c index 9897e86..9d04b7c 100644 --- a/pixman/pixman-arm-simd.c +++ b/pixman/pixman-arm-simd.c @@ -33,9 +33,9 @@ static void arm_CompositeAdd_8000_8000 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -51,8 +51,8 @@ arm_CompositeAdd_8000_8000 ( uint16_t w; uint8_t s, d; - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -103,9 +103,9 @@ static void arm_composite_over_8888_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -123,8 +123,8 @@ arm_composite_over_8888_8888 ( uint32_t upper_component_mask = 0xff00ff00; uint32_t alpha_mask = 0xff; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -196,9 +196,9 @@ static void arm_composite_over_8888_n_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -216,10 +216,10 @@ arm_composite_over_8888_n_8888 ( uint32_t component_half = 0x800080; uint32_t alpha_mask = 0xff; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = (mask) >> 24; while (height--) @@ -305,9 +305,9 @@ static void arm_CompositeOver_n_8_8888 ( pixman_implementation_t * impl, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -323,7 +323,7 @@ arm_CompositeOver_n_8_8888 ( int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); // bail out if fully transparent srca = src >> 24; @@ -336,8 +336,8 @@ arm_CompositeOver_n_8_8888 ( uint32_t src_hi = (src >> 8) & component_mask; uint32_t src_lo = src & component_mask; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); while (height--) { diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c index 1ed7805..a956c24 100644 --- a/pixman/pixman-fast-path.c +++ b/pixman/pixman-fast-path.c @@ -102,9 +102,9 @@ fbIn (uint32_t x, uint8_t y) static void fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -122,9 +122,9 @@ fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, uint32_t s, d; uint16_t w; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -291,9 +291,9 @@ fast_CompositeIn_8_8 (pixman_implementation_t *imp, static void fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -309,14 +309,14 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp, int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -349,9 +349,9 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp, static void fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -367,14 +367,14 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); while (height--) { @@ -414,9 +414,9 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, static void fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -433,14 +433,14 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp, int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 3); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 3); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -477,9 +477,9 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp, static void fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -496,14 +496,14 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp, int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -541,9 +541,9 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp, static void fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -561,7 +561,7 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, int dstStride, maskStride; uint16_t w; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) @@ -569,8 +569,8 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, src16 = cvt8888to0565(src); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); while (height--) { @@ -616,9 +616,9 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, static void fast_composite_over_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -634,8 +634,8 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp, uint8_t a; uint16_t w; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -661,9 +661,9 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp, static void fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -680,8 +680,8 @@ fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 3); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 3); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -712,9 +712,9 @@ fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp, static void fast_composite_over_8888_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -731,8 +731,8 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); while (height--) { @@ -765,9 +765,9 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp, static void fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -782,8 +782,8 @@ fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); while (height--) { @@ -805,9 +805,9 @@ fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp, static void fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -824,8 +824,8 @@ fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp, uint8_t s, d; uint16_t t; - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -856,9 +856,9 @@ fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp, static void fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -874,8 +874,8 @@ fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp, uint16_t w; uint32_t s, d; - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -906,9 +906,9 @@ fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp, static void fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -925,9 +925,9 @@ fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, uint32_t src; uint8_t sa; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid (pSrc, pDst->bits.format); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); + src = _pixman_image_get_solid (src_image, dst_image->bits.format); sa = (src >> 24); while (height--) @@ -963,9 +963,9 @@ fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, static void fast_CompositeSolidFill (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -977,16 +977,16 @@ fast_CompositeSolidFill (pixman_implementation_t *imp, { uint32_t src; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); - if (pDst->bits.format == PIXMAN_a8) + if (dst_image->bits.format == PIXMAN_a8) src = src >> 24; - else if (pDst->bits.format == PIXMAN_r5g6b5 || - pDst->bits.format == PIXMAN_b5g6r5) + else if (dst_image->bits.format == PIXMAN_r5g6b5 || + dst_image->bits.format == PIXMAN_b5g6r5) src = cvt8888to0565 (src); - pixman_fill (pDst->bits.bits, pDst->bits.rowstride, - PIXMAN_FORMAT_BPP (pDst->bits.format), + pixman_fill (dst_image->bits.bits, dst_image->bits.rowstride, + PIXMAN_FORMAT_BPP (dst_image->bits.format), xDst, yDst, width, height, src); @@ -995,9 +995,9 @@ fast_CompositeSolidFill (pixman_implementation_t *imp, static void fast_CompositeSrc_8888_x888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1012,8 +1012,8 @@ fast_CompositeSrc_8888_x888 (pixman_implementation_t *imp, int dstStride, srcStride; uint32_t n_bytes = width * sizeof (uint32_t); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, src, 1); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dst, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, src, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dst, 1); while (height--) { @@ -1076,9 +1076,9 @@ static const pixman_fast_path_t c_fast_paths[] = static void fast_CompositeSrcScaleNearest (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t *pSrc, - pixman_image_t *pMask, - pixman_image_t *pDst, + pixman_image_t *src_image, + pixman_image_t *mask_image, + pixman_image_t *dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1094,17 +1094,17 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp, int i, j; pixman_vector_t v; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dst, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dst, 1); /* pass in 0 instead of xSrc and ySrc because xSrc and ySrc need to be * transformed from destination space to source space */ - fbComposeGetStart (pSrc, 0, 0, uint32_t, srcStride, src, 1); + fbComposeGetStart (src_image, 0, 0, uint32_t, srcStride, src, 1); /* reference point is the center of the pixel */ v.vector[0] = pixman_int_to_fixed(xSrc) + pixman_fixed_1 / 2; v.vector[1] = pixman_int_to_fixed(ySrc) + pixman_fixed_1 / 2; v.vector[2] = pixman_fixed_1; - if (!pixman_transform_point_3d (pSrc->common.transform, &v)) + if (!pixman_transform_point_3d (src_image->common.transform, &v)) return; /* Round down to closest integer, ensuring that 0.5 rounds to 0, not 1 */ @@ -1122,32 +1122,32 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp, y = vy >> 16; /* apply the repeat function */ - switch (pSrc->common.repeat) { + switch (src_image->common.repeat) { case PIXMAN_REPEAT_NORMAL: - x = MOD (x, pSrc->bits.width); - y = MOD (y, pSrc->bits.height); + x = MOD (x, src_image->bits.width); + y = MOD (y, src_image->bits.height); inside_bounds = TRUE; break; case PIXMAN_REPEAT_PAD: - x = CLIP (x, 0, pSrc->bits.width-1); - y = CLIP (y, 0, pSrc->bits.height-1); + x = CLIP (x, 0, src_image->bits.width-1); + y = CLIP (y, 0, src_image->bits.height-1); inside_bounds = TRUE; break; case PIXMAN_REPEAT_REFLECT: - x = MOD (x, pSrc->bits.width * 2); - if (x >= pSrc->bits.width) - x = pSrc->bits.width * 2 - x - 1; - y = MOD (y, pSrc->bits.height * 2); - if (y >= pSrc->bits.height) - y = pSrc->bits.height * 2 - y - 1; + x = MOD (x, src_image->bits.width * 2); + if (x >= src_image->bits.width) + x = src_image->bits.width * 2 - x - 1; + y = MOD (y, src_image->bits.height * 2); + if (y >= src_image->bits.height) + y = src_image->bits.height * 2 - y - 1; inside_bounds = TRUE; break; case PIXMAN_REPEAT_NONE: default: - inside_bounds = (x >= 0 && x < pSrc->bits.width && y >= 0 && y < pSrc->bits.height); + inside_bounds = (x >= 0 && x < src_image->bits.width && y >= 0 && y < src_image->bits.height); break; } @@ -1161,11 +1161,11 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp, /* adjust the x location by a unit vector in the x direction: * this is equivalent to transforming x+1 of the destination point to source space */ - vx += pSrc->common.transform->matrix[0][0]; + vx += src_image->common.transform->matrix[0][0]; } /* adjust the y location by a unit vector in the y direction * this is equivalent to transforming y+1 of the destination point to source space */ - v.vector[1] += pSrc->common.transform->matrix[1][1]; + v.vector[1] += src_image->common.transform->matrix[1][1]; dst += dstStride; } } diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index d500321..fd688e9 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -921,9 +921,9 @@ mmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op, static void mmx_CompositeOver_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -941,12 +941,12 @@ mmx_CompositeOver_n_8888 (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src >> 24 == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1000,9 +1000,9 @@ mmx_CompositeOver_n_8888 (pixman_implementation_t *imp, static void mmx_CompositeOver_n_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1020,12 +1020,12 @@ mmx_CompositeOver_n_0565 (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src >> 24 == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1086,9 +1086,9 @@ mmx_CompositeOver_n_0565 (pixman_implementation_t *imp, static void mmx_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1106,14 +1106,14 @@ mmx_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (srca == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); vsrc = load8888(src); vsrca = expand_alpha(vsrc); @@ -1190,9 +1190,9 @@ mmx_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, static void mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1212,10 +1212,10 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = mask | mask >> 8 | mask >> 16 | mask >> 24; vmask = load8888 (mask); srca = MC(4x00ff); @@ -1275,9 +1275,9 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp, static void mmx_Composite_over_x888_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1297,9 +1297,9 @@ mmx_Composite_over_x888_n_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = mask | mask >> 8 | mask >> 16 | mask >> 24; vmask = load8888 (mask); @@ -1410,9 +1410,9 @@ mmx_Composite_over_x888_n_8888 (pixman_implementation_t *imp, static void mmx_composite_over_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1431,8 +1431,8 @@ mmx_composite_over_8888_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -1463,9 +1463,9 @@ mmx_composite_over_8888_8888 (pixman_implementation_t *imp, static void mmx_composite_over_8888_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1482,12 +1482,12 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -1565,9 +1565,9 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp, static void mmx_CompositeOver_n_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1587,7 +1587,7 @@ mmx_CompositeOver_n_8_8888 (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (srca == 0) @@ -1595,8 +1595,8 @@ mmx_CompositeOver_n_8_8888 (pixman_implementation_t *imp, srcsrc = (uint64_t)src << 32 | src; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1837,9 +1837,9 @@ pixman_fill_mmx (uint32_t *bits, static void mmx_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1859,20 +1859,20 @@ mmx_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (srca == 0) { - pixman_fill_mmx (pDst->bits.bits, pDst->bits.rowstride, PIXMAN_FORMAT_BPP (pDst->bits.format), + pixman_fill_mmx (dst_image->bits.bits, dst_image->bits.rowstride, PIXMAN_FORMAT_BPP (dst_image->bits.format), xDst, yDst, width, height, 0); return; } srcsrc = (uint64_t)src << 32 | src; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1969,9 +1969,9 @@ mmx_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, static void mmx_CompositeOver_n_8_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -1991,14 +1991,14 @@ mmx_CompositeOver_n_8_0565 (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (srca == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -2102,9 +2102,9 @@ mmx_CompositeOver_n_8_0565 (pixman_implementation_t *imp, static void mmx_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2121,12 +2121,12 @@ mmx_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -2224,9 +2224,9 @@ mmx_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, static void mmx_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2243,12 +2243,12 @@ mmx_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -2324,9 +2324,9 @@ mmx_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, static void mmx_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2344,14 +2344,14 @@ mmx_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, CHECKPOINT(); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (srca == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -2432,9 +2432,9 @@ mmx_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, static void mmx_CompositeIn_n_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2452,10 +2452,10 @@ mmx_CompositeIn_n_8_8 (pixman_implementation_t *imp, uint8_t sa; __m64 vsrc, vsrca; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); sa = src >> 24; if (sa == 0) @@ -2472,8 +2472,8 @@ mmx_CompositeIn_n_8_8 (pixman_implementation_t *imp, maskLine += maskStride; w = width; - if ((((unsigned long)pDst & 3) == 0) && - (((unsigned long)pSrc & 3) == 0)) + if ((((unsigned long)dst_image & 3) == 0) && + (((unsigned long)src_image & 3) == 0)) { while (w >= 4) { @@ -2516,9 +2516,9 @@ mmx_CompositeIn_n_8_8 (pixman_implementation_t *imp, static void mmx_CompositeIn_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2533,8 +2533,8 @@ mmx_CompositeIn_8_8 (pixman_implementation_t *imp, int srcStride, dstStride; uint16_t w; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); while (height--) { @@ -2544,8 +2544,8 @@ mmx_CompositeIn_8_8 (pixman_implementation_t *imp, srcLine += srcStride; w = width; - if ((((unsigned long)pDst & 3) == 0) && - (((unsigned long)pSrc & 3) == 0)) + if ((((unsigned long)dst_image & 3) == 0) && + (((unsigned long)src_image & 3) == 0)) { while (w >= 4) { @@ -2581,9 +2581,9 @@ mmx_CompositeIn_8_8 (pixman_implementation_t *imp, static void mmx_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2601,10 +2601,10 @@ mmx_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, uint8_t sa; __m64 vsrc, vsrca; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); sa = src >> 24; if (sa == 0) @@ -2621,8 +2621,8 @@ mmx_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, maskLine += maskStride; w = width; - if ((((unsigned long)pMask & 3) == 0) && - (((unsigned long)pDst & 3) == 0)) + if ((((unsigned long)mask_image & 3) == 0) && + (((unsigned long)dst_image & 3) == 0)) { while (w >= 4) { @@ -2660,9 +2660,9 @@ mmx_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, static void mmx_CompositeAdd_8000_8000 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2681,8 +2681,8 @@ mmx_CompositeAdd_8000_8000 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -2733,9 +2733,9 @@ mmx_CompositeAdd_8000_8000 (pixman_implementation_t *imp, static void mmx_CompositeAdd_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2753,8 +2753,8 @@ mmx_CompositeAdd_8888_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -2932,9 +2932,9 @@ pixman_blt_mmx (uint32_t *src_bits, static void mmx_CompositeCopyArea (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2944,21 +2944,21 @@ mmx_CompositeCopyArea (pixman_implementation_t *imp, int32_t width, int32_t height) { - pixman_blt_mmx (pSrc->bits.bits, - pDst->bits.bits, - pSrc->bits.rowstride, - pDst->bits.rowstride, - PIXMAN_FORMAT_BPP (pSrc->bits.format), - PIXMAN_FORMAT_BPP (pDst->bits.format), + pixman_blt_mmx (src_image->bits.bits, + dst_image->bits.bits, + src_image->bits.rowstride, + dst_image->bits.rowstride, + PIXMAN_FORMAT_BPP (src_image->bits.format), + PIXMAN_FORMAT_BPP (dst_image->bits.format), xSrc, ySrc, xDst, yDst, width, height); } static void mmx_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2974,9 +2974,9 @@ mmx_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, int srcStride, maskStride, dstStride; uint16_t w; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 54d6563..f051552 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -562,9 +562,9 @@ _pixman_run_fast_path (const pixman_fast_path_t *paths, void _pixman_walk_composite_region (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c index 0e1791c..30db82a 100644 --- a/pixman/pixman-region.c +++ b/pixman/pixman-region.c @@ -179,24 +179,24 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ if (!pixman_rect_alloc(pReg, n)) { return FALSE; } -#define ADDRECT(pNextRect,nx1,ny1,nx2,ny2) \ +#define ADDRECT(next_rect,nx1,ny1,nx2,ny2) \ { \ - pNextRect->x1 = nx1; \ - pNextRect->y1 = ny1; \ - pNextRect->x2 = nx2; \ - pNextRect->y2 = ny2; \ - pNextRect++; \ + next_rect->x1 = nx1; \ + next_rect->y1 = ny1; \ + next_rect->x2 = nx2; \ + next_rect->y2 = ny2; \ + next_rect++; \ } -#define NEWRECT(pReg,pNextRect,nx1,ny1,nx2,ny2) \ +#define NEWRECT(pReg,next_rect,nx1,ny1,nx2,ny2) \ { \ if (!(pReg)->data || ((pReg)->data->numRects == (pReg)->data->size))\ { \ if (!pixman_rect_alloc(pReg, 1)) \ return FALSE; \ - pNextRect = PIXREGION_TOP(pReg); \ + next_rect = PIXREGION_TOP(pReg); \ } \ - ADDRECT(pNextRect,nx1,ny1,nx2,ny2); \ + ADDRECT(next_rect,nx1,ny1,nx2,ny2); \ pReg->data->numRects++; \ assert(pReg->data->numRects<=pReg->data->size); \ } @@ -507,7 +507,7 @@ pixman_region_appendNonO ( int y1, int y2) { - box_type_t * pNextRect; + box_type_t * next_rect; int newRects; newRects = rEnd - r; @@ -517,11 +517,11 @@ pixman_region_appendNonO ( /* Make sure we have enough space for all rectangles to be added */ RECTALLOC(region, newRects); - pNextRect = PIXREGION_TOP(region); + next_rect = PIXREGION_TOP(region); region->data->numRects += newRects; do { assert(r->x1 < r->x2); - ADDRECT(pNextRect, r->x1, y1, r->x2, y2); + ADDRECT(next_rect, r->x1, y1, r->x2, y2); r++; } while (r != rEnd); @@ -913,9 +913,9 @@ pixman_region_intersectO (region_type_t *region, { int x1; int x2; - box_type_t * pNextRect; + box_type_t * next_rect; - pNextRect = PIXREGION_TOP(region); + next_rect = PIXREGION_TOP(region); assert(y1 < y2); assert(r1 != r1End && r2 != r2End); @@ -929,7 +929,7 @@ pixman_region_intersectO (region_type_t *region, * overlap to the new region. */ if (x1 < x2) - NEWRECT(region, pNextRect, x1, y1, x2, y2); + NEWRECT(region, next_rect, x1, y1, x2, y2); /* * Advance the pointer(s) with the leftmost right side, since the next @@ -1015,7 +1015,7 @@ PREFIX(_intersect) (region_type_t * newReg, if (x2 < r->x2) x2 = r->x2; \ } else { \ /* Add current rectangle, start new one */ \ - NEWRECT(region, pNextRect, x1, y1, x2, y2); \ + NEWRECT(region, next_rect, x1, y1, x2, y2); \ x1 = r->x1; \ x2 = r->x2; \ } \ @@ -1052,14 +1052,14 @@ pixman_region_unionO ( int y2, int *pOverlap) { - box_type_t * pNextRect; + box_type_t * next_rect; int x1; /* left and right side of current union */ int x2; assert (y1 < y2); assert(r1 != r1End && r2 != r2End); - pNextRect = PIXREGION_TOP(region); + next_rect = PIXREGION_TOP(region); /* Start off current rectangle */ if (r1->x1 < r2->x1) @@ -1096,7 +1096,7 @@ pixman_region_unionO ( } /* Add current rectangle */ - NEWRECT(region, pNextRect, x1, y1, x2, y2); + NEWRECT(region, next_rect, x1, y1, x2, y2); return TRUE; } @@ -1545,7 +1545,7 @@ pixman_region_subtractO ( int y2, int *pOverlap) { - box_type_t * pNextRect; + box_type_t * next_rect; int x1; x1 = r1->x1; @@ -1553,7 +1553,7 @@ pixman_region_subtractO ( assert(y1x1); - NEWRECT(region, pNextRect, x1, y1, r2->x1, y2); + NEWRECT(region, next_rect, x1, y1, r2->x1, y2); x1 = r2->x2; if (x1 >= r1->x2) @@ -1622,7 +1622,7 @@ pixman_region_subtractO ( * Minuend used up: add any remaining piece before advancing. */ if (r1->x2 > x1) - NEWRECT(region, pNextRect, x1, y1, r1->x2, y2); + NEWRECT(region, next_rect, x1, y1, r1->x2, y2); r1++; if (r1 != r1End) x1 = r1->x1; @@ -1635,7 +1635,7 @@ pixman_region_subtractO ( while (r1 != r1End) { assert(x1x2); - NEWRECT(region, pNextRect, x1, y1, r1->x2, y2); + NEWRECT(region, next_rect, x1, y1, r1->x2, y2); r1++; if (r1 != r1End) x1 = r1->x1; diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index b160763..38e3011 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -2499,9 +2499,9 @@ sse2CombineAddC (pixman_implementation_t *imp, pixman_op_t op, static void sse2_CompositeOver_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2518,12 +2518,12 @@ sse2_CompositeOver_n_8888 (pixman_implementation_t *imp, __m128i xmmSrc, xmmAlpha; __m128i xmmDst, xmmDstLo, xmmDstHi; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2586,9 +2586,9 @@ sse2_CompositeOver_n_8888 (pixman_implementation_t *imp, static void sse2_CompositeOver_n_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2605,12 +2605,12 @@ sse2_CompositeOver_n_0565 (pixman_implementation_t *imp, __m128i xmmSrc, xmmAlpha; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2676,9 +2676,9 @@ sse2_CompositeOver_n_0565 (pixman_implementation_t *imp, static void sse2_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2700,13 +2700,13 @@ sse2_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, __m64 mmxSrc, mmxAlpha, mmxMask, mmxDst; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); xmmSrc = _mm_unpacklo_epi8 (createMask_2x32_128 (src, src), _mm_setzero_si128 ()); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2810,9 +2810,9 @@ sse2_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, static void sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2833,9 +2833,9 @@ sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp, __m128i xmmDst, xmmDstLo, xmmDstHi; __m128i xmmAlphaLo, xmmAlphaHi; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); xmmMask = createMask_16_128 (mask >> 24); @@ -2923,9 +2923,9 @@ sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp, static void sse2_Composite_over_x888_n_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -2945,9 +2945,9 @@ sse2_Composite_over_x888_n_8888 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - mask = _pixman_image_get_solid (pMask, pDst->bits.format); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); xmmMask = createMask_16_128 (mask >> 24); xmmAlpha = Mask00ff; @@ -3036,9 +3036,9 @@ sse2_Composite_over_x888_n_8888 (pixman_implementation_t *imp, static void sse2_composite_over_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3052,8 +3052,8 @@ sse2_composite_over_8888_8888 (pixman_implementation_t *imp, uint32_t *dstLine, *dst; uint32_t *srcLine, *src; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); dst = dstLine; src = srcLine; @@ -3085,9 +3085,9 @@ fast_composite_over_8888_0565pixel (uint32_t src, uint16_t dst) static void sse2_composite_over_8888_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3106,8 +3106,8 @@ sse2_composite_over_8888_0565 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -3115,7 +3115,7 @@ sse2_composite_over_8888_0565 (pixman_implementation_t *imp, * I copy the code from MMX one and keep the fixme. * If it's a problem there, probably is a problem here. */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -3199,9 +3199,9 @@ sse2_composite_over_8888_0565 (pixman_implementation_t *imp, static void sse2_CompositeOver_n_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3224,14 +3224,14 @@ sse2_CompositeOver_n_8_8888 (pixman_implementation_t *imp, __m64 mmxSrc, mmxAlpha, mmxMask, mmxDest; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); xmmDef = createMask_2x32_128 (src, src); xmmSrc = expandPixel_32_1x128 (src); @@ -3477,9 +3477,9 @@ pixmanFillsse2 (uint32_t *bits, static void sse2_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3499,19 +3499,19 @@ sse2_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, __m128i xmmSrc, xmmDef; __m128i xmmMask, xmmMaskLo, xmmMaskHi; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) { - pixmanFillsse2 (pDst->bits.bits, pDst->bits.rowstride, - PIXMAN_FORMAT_BPP (pDst->bits.format), + pixmanFillsse2 (dst_image->bits.bits, dst_image->bits.rowstride, + PIXMAN_FORMAT_BPP (dst_image->bits.format), xDst, yDst, width, height, 0); return; } - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); xmmDef = createMask_2x32_128 (src, src); xmmSrc = expandPixel_32_1x128 (src); @@ -3613,9 +3613,9 @@ sse2_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, static void sse2_CompositeOver_n_8_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3637,14 +3637,14 @@ sse2_CompositeOver_n_8_0565 (pixman_implementation_t *imp, __m128i xmmMask, xmmMaskLo, xmmMaskHi; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); srca = src >> 24; if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -3763,9 +3763,9 @@ sse2_CompositeOver_n_8_0565 (pixman_implementation_t *imp, static void sse2_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3785,8 +3785,8 @@ sse2_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -3794,7 +3794,7 @@ sse2_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, * I copy the code from MMX one and keep the fixme. * If it's a problem there, probably is a problem here. */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -3898,9 +3898,9 @@ sse2_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, static void sse2_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -3919,8 +3919,8 @@ sse2_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, __m128i xmmSrcLo, xmmSrcHi; __m128i xmmDstLo, xmmDstHi; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -3928,7 +3928,7 @@ sse2_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, * I copy the code from MMX one and keep the fixme. * If it's a problem there, probably is a problem here. */ - assert (pSrc->pDrawable == pMask->pDrawable); + assert (src_image->pDrawable == mask_image->pDrawable); #endif while (height--) @@ -4013,9 +4013,9 @@ sse2_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, static void sse2_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4038,13 +4038,13 @@ sse2_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, __m64 mmxSrc, mmxAlpha, mmxMask, mmxDest; - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); if (src == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint32_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint32_t, maskStride, maskLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -4161,9 +4161,9 @@ sse2_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, static void sse2_CompositeIn_n_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4184,10 +4184,10 @@ sse2_CompositeIn_n_8_8 (pixman_implementation_t *imp, __m128i xmmMask, xmmMaskLo, xmmMaskHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); sa = src >> 24; if (sa == 0) @@ -4264,9 +4264,9 @@ sse2_CompositeIn_n_8_8 (pixman_implementation_t *imp, static void sse2_CompositeIn_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4285,8 +4285,8 @@ sse2_CompositeIn_8_8 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); while (height--) { @@ -4354,9 +4354,9 @@ sse2_CompositeIn_8_8 (pixman_implementation_t *imp, static void sse2_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4378,10 +4378,10 @@ sse2_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, __m128i xmmMask, xmmMaskLo, xmmMaskHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); - src = _pixman_image_get_solid(pSrc, pDst->bits.format); + src = _pixman_image_get_solid(src_image, dst_image->bits.format); sa = src >> 24; if (sa == 0) @@ -4460,9 +4460,9 @@ sse2_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, static void sse2_CompositeAdd_8000_8000 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4478,8 +4478,8 @@ sse2_CompositeAdd_8000_8000 (pixman_implementation_t *imp, uint16_t w; uint16_t t; - fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -4527,9 +4527,9 @@ sse2_CompositeAdd_8000_8000 (pixman_implementation_t *imp, static void sse2_CompositeAdd_8888_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4543,8 +4543,8 @@ sse2_CompositeAdd_8888_8888 (pixman_implementation_t *imp, uint32_t *srcLine, *src; int dstStride, srcStride; - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -4705,9 +4705,9 @@ pixmanBltsse2 (uint32_t *src_bits, static void sse2_CompositeCopyArea (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4717,12 +4717,12 @@ sse2_CompositeCopyArea (pixman_implementation_t *imp, int32_t width, int32_t height) { - pixmanBltsse2 (pSrc->bits.bits, - pDst->bits.bits, - pSrc->bits.rowstride, - pDst->bits.rowstride, - PIXMAN_FORMAT_BPP (pSrc->bits.format), - PIXMAN_FORMAT_BPP (pDst->bits.format), + pixmanBltsse2 (src_image->bits.bits, + dst_image->bits.bits, + src_image->bits.rowstride, + dst_image->bits.rowstride, + PIXMAN_FORMAT_BPP (src_image->bits.format), + PIXMAN_FORMAT_BPP (dst_image->bits.format), xSrc, ySrc, xDst, yDst, width, height); } @@ -4731,9 +4731,9 @@ sse2_CompositeCopyArea (pixman_implementation_t *imp, void sse2_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int32_t xSrc, int32_t ySrc, int32_t xMask, @@ -4754,9 +4754,9 @@ sse2_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, __m128i xmmDst, xmmDstLo, xmmDstHi; __m128i xmmMask, xmmMaskLo, xmmMaskHi; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (pMask, xMask, yMask, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (mask_image, xMask, yMask, uint8_t, maskStride, maskLine, 1); + fbComposeGetStart (src_image, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); while (height--) { diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c index b7f3af9..43fd074 100644 --- a/pixman/pixman-utils.c +++ b/pixman/pixman-utils.c @@ -36,15 +36,15 @@ #define BOUND(v) (int16_t) ((v) < INT16_MIN ? INT16_MIN : (v) > INT16_MAX ? INT16_MAX : (v)) static inline pixman_bool_t -miClipPictureReg (pixman_region32_t * pRegion, +miClipPictureReg (pixman_region32_t * region, pixman_region32_t * pClip, int dx, int dy) { - if (pixman_region32_n_rects(pRegion) == 1 && + if (pixman_region32_n_rects(region) == 1 && pixman_region32_n_rects(pClip) == 1) { - pixman_box32_t * pRbox = pixman_region32_rectangles(pRegion, NULL); + pixman_box32_t * pRbox = pixman_region32_rectangles(region, NULL); pixman_box32_t * pCbox = pixman_region32_rectangles(pClip, NULL); int v; @@ -59,7 +59,7 @@ miClipPictureReg (pixman_region32_t * pRegion, if (pRbox->x1 >= pRbox->x2 || pRbox->y1 >= pRbox->y2) { - pixman_region32_init (pRegion); + pixman_region32_init (region); } } else if (!pixman_region32_not_empty (pClip)) @@ -69,18 +69,18 @@ miClipPictureReg (pixman_region32_t * pRegion, else { if (dx || dy) - pixman_region32_translate (pRegion, -dx, -dy); - if (!pixman_region32_intersect (pRegion, pRegion, pClip)) + pixman_region32_translate (region, -dx, -dy); + if (!pixman_region32_intersect (region, region, pClip)) return FALSE; if (dx || dy) - pixman_region32_translate(pRegion, dx, dy); + pixman_region32_translate(region, dx, dy); } - return pixman_region32_not_empty(pRegion); + return pixman_region32_not_empty(region); } static inline pixman_bool_t -miClipPictureSrc (pixman_region32_t * pRegion, +miClipPictureSrc (pixman_region32_t * region, pixman_image_t * pPicture, int dx, int dy) @@ -93,7 +93,7 @@ miClipPictureSrc (pixman_region32_t * pRegion, if (!pPicture->common.clip_sources || !pPicture->common.client_clip) return TRUE; - return miClipPictureReg (pRegion, + return miClipPictureReg (region, &pPicture->common.clip_region, dx, dy); } @@ -103,10 +103,10 @@ miClipPictureSrc (pixman_region32_t * pRegion, * an allocation failure, but rendering ignores those anyways. */ static pixman_bool_t -pixman_compute_composite_region32 (pixman_region32_t * pRegion, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, +pixman_compute_composite_region32 (pixman_region32_t * region, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -118,91 +118,91 @@ pixman_compute_composite_region32 (pixman_region32_t * pRegion, { int v; - pRegion->extents.x1 = xDst; + region->extents.x1 = xDst; v = xDst + width; - pRegion->extents.x2 = BOUND(v); - pRegion->extents.y1 = yDst; + region->extents.x2 = BOUND(v); + region->extents.y1 = yDst; v = yDst + height; - pRegion->extents.y2 = BOUND(v); + region->extents.y2 = BOUND(v); - pRegion->extents.x1 = MAX (pRegion->extents.x1, 0); - pRegion->extents.y1 = MAX (pRegion->extents.y1, 0); + region->extents.x1 = MAX (region->extents.x1, 0); + region->extents.y1 = MAX (region->extents.y1, 0); /* Some X servers rely on an old bug, where pixman would just believe the * set clip_region and not clip against the destination geometry. So, * since only X servers set "source clip", we don't clip against * destination geometry when that is set. */ - if (!pDst->common.clip_sources) + if (!dst_image->common.clip_sources) { - pRegion->extents.x2 = MIN (pRegion->extents.x2, pDst->bits.width); - pRegion->extents.y2 = MIN (pRegion->extents.y2, pDst->bits.height); + region->extents.x2 = MIN (region->extents.x2, dst_image->bits.width); + region->extents.y2 = MIN (region->extents.y2, dst_image->bits.height); } - pRegion->data = 0; + region->data = 0; /* Check for empty operation */ - if (pRegion->extents.x1 >= pRegion->extents.x2 || - pRegion->extents.y1 >= pRegion->extents.y2) + if (region->extents.x1 >= region->extents.x2 || + region->extents.y1 >= region->extents.y2) { - pixman_region32_init (pRegion); + pixman_region32_init (region); return FALSE; } - if (pDst->common.have_clip_region) + if (dst_image->common.have_clip_region) { - if (!miClipPictureReg (pRegion, &pDst->common.clip_region, 0, 0)) + if (!miClipPictureReg (region, &dst_image->common.clip_region, 0, 0)) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } } - if (pDst->common.alpha_map && pDst->common.alpha_map->common.have_clip_region) + if (dst_image->common.alpha_map && dst_image->common.alpha_map->common.have_clip_region) { - if (!miClipPictureReg (pRegion, &pDst->common.alpha_map->common.clip_region, - -pDst->common.alpha_origin_x, - -pDst->common.alpha_origin_y)) + if (!miClipPictureReg (region, &dst_image->common.alpha_map->common.clip_region, + -dst_image->common.alpha_origin_x, + -dst_image->common.alpha_origin_y)) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } } /* clip against src */ - if (pSrc->common.have_clip_region) + if (src_image->common.have_clip_region) { - if (!miClipPictureSrc (pRegion, pSrc, xDst - xSrc, yDst - ySrc)) + if (!miClipPictureSrc (region, src_image, xDst - xSrc, yDst - ySrc)) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } } - if (pSrc->common.alpha_map && pSrc->common.alpha_map->common.have_clip_region) + if (src_image->common.alpha_map && src_image->common.alpha_map->common.have_clip_region) { - if (!miClipPictureSrc (pRegion, (pixman_image_t *)pSrc->common.alpha_map, - xDst - (xSrc - pSrc->common.alpha_origin_x), - yDst - (ySrc - pSrc->common.alpha_origin_y))) + if (!miClipPictureSrc (region, (pixman_image_t *)src_image->common.alpha_map, + xDst - (xSrc - src_image->common.alpha_origin_x), + yDst - (ySrc - src_image->common.alpha_origin_y))) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } } /* clip against mask */ - if (pMask && pMask->common.have_clip_region) + if (mask_image && mask_image->common.have_clip_region) { - if (!miClipPictureSrc (pRegion, pMask, xDst - xMask, yDst - yMask)) + if (!miClipPictureSrc (region, mask_image, xDst - xMask, yDst - yMask)) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } - if (pMask->common.alpha_map && pMask->common.alpha_map->common.have_clip_region) + if (mask_image->common.alpha_map && mask_image->common.alpha_map->common.have_clip_region) { - if (!miClipPictureSrc (pRegion, (pixman_image_t *)pMask->common.alpha_map, - xDst - (xMask - pMask->common.alpha_origin_x), - yDst - (yMask - pMask->common.alpha_origin_y))) + if (!miClipPictureSrc (region, (pixman_image_t *)mask_image->common.alpha_map, + xDst - (xMask - mask_image->common.alpha_origin_x), + yDst - (yMask - mask_image->common.alpha_origin_y))) { - pixman_region32_fini (pRegion); + pixman_region32_fini (region); return FALSE; } } @@ -212,10 +212,10 @@ pixman_compute_composite_region32 (pixman_region32_t * pRegion, } PIXMAN_EXPORT pixman_bool_t -pixman_compute_composite_region (pixman_region16_t * pRegion, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, +pixman_compute_composite_region (pixman_region16_t * region, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -230,13 +230,13 @@ pixman_compute_composite_region (pixman_region16_t * pRegion, pixman_region32_init (&r32); - retval = pixman_compute_composite_region32 (&r32, pSrc, pMask, pDst, + retval = pixman_compute_composite_region32 (&r32, src_image, mask_image, dst_image, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height); if (retval) { - if (!pixman_region16_copy_from_region32 (pRegion, &r32)) + if (!pixman_region16_copy_from_region32 (region, &r32)) retval = FALSE; } @@ -375,9 +375,9 @@ pixman_contract(uint32_t *dst, const uint64_t *src, int width) static void walk_region_internal (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -413,33 +413,33 @@ walk_region_internal (pixman_implementation_t *imp, if (maskRepeat) { - y_msk = MOD (y_msk, pMask->bits.height); - if (h_this > pMask->bits.height - y_msk) - h_this = pMask->bits.height - y_msk; + y_msk = MOD (y_msk, mask_image->bits.height); + if (h_this > mask_image->bits.height - y_msk) + h_this = mask_image->bits.height - y_msk; } if (srcRepeat) { - y_src = MOD (y_src, pSrc->bits.height); - if (h_this > pSrc->bits.height - y_src) - h_this = pSrc->bits.height - y_src; + y_src = MOD (y_src, src_image->bits.height); + if (h_this > src_image->bits.height - y_src) + h_this = src_image->bits.height - y_src; } while (w) { w_this = w; if (maskRepeat) { - x_msk = MOD (x_msk, pMask->bits.width); - if (w_this > pMask->bits.width - x_msk) - w_this = pMask->bits.width - x_msk; + x_msk = MOD (x_msk, mask_image->bits.width); + if (w_this > mask_image->bits.width - x_msk) + w_this = mask_image->bits.width - x_msk; } if (srcRepeat) { - x_src = MOD (x_src, pSrc->bits.width); - if (w_this > pSrc->bits.width - x_src) - w_this = pSrc->bits.width - x_src; + x_src = MOD (x_src, src_image->bits.width); + if (w_this > src_image->bits.width - x_src) + w_this = src_image->bits.width - x_src; } (*compositeRect) (imp, - op, pSrc, pMask, pDst, + op, src_image, mask_image, dst_image, x_src, y_src, x_msk, y_msk, x_dst, y_dst, w_this, h_this); w -= w_this; @@ -459,9 +459,9 @@ walk_region_internal (pixman_implementation_t *imp, void _pixman_walk_composite_region (pixman_implementation_t *imp, pixman_op_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -477,10 +477,10 @@ _pixman_walk_composite_region (pixman_implementation_t *imp, pixman_region32_init (®ion); if (pixman_compute_composite_region32 ( - ®ion, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height)) + ®ion, src_image, mask_image, dst_image, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height)) { walk_region_internal (imp, op, - pSrc, pMask, pDst, + src_image, mask_image, dst_image, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height, FALSE, FALSE, ®ion, @@ -511,9 +511,9 @@ mask_is_solid (pixman_image_t *mask) static const pixman_fast_path_t * get_fast_path (const pixman_fast_path_t *fast_paths, pixman_op_t op, - pixman_image_t *pSrc, - pixman_image_t *pMask, - pixman_image_t *pDst, + pixman_image_t *src_image, + pixman_image_t *mask_image, + pixman_image_t *dst_image, pixman_bool_t is_pixbuf) { const pixman_fast_path_t *info; @@ -526,8 +526,8 @@ get_fast_path (const pixman_fast_path_t *fast_paths, if (info->op != op) continue; - if ((info->src_format == PIXMAN_solid && _pixman_image_is_solid (pSrc)) || - (pSrc->type == BITS && info->src_format == pSrc->bits.format)) + if ((info->src_format == PIXMAN_solid && _pixman_image_is_solid (src_image)) || + (src_image->type == BITS && info->src_format == src_image->bits.format)) { valid_src = TRUE; } @@ -535,20 +535,20 @@ get_fast_path (const pixman_fast_path_t *fast_paths, if (!valid_src) continue; - if ((info->mask_format == PIXMAN_null && !pMask) || - (pMask && pMask->type == BITS && info->mask_format == pMask->bits.format)) + if ((info->mask_format == PIXMAN_null && !mask_image) || + (mask_image && mask_image->type == BITS && info->mask_format == mask_image->bits.format)) { valid_mask = TRUE; if (info->flags & NEED_SOLID_MASK) { - if (!pMask || !mask_is_solid (pMask)) + if (!mask_image || !mask_is_solid (mask_image)) valid_mask = FALSE; } if (info->flags & NEED_COMPONENT_ALPHA) { - if (!pMask || !pMask->common.component_alpha) + if (!mask_image || !mask_image->common.component_alpha) valid_mask = FALSE; } } @@ -556,7 +556,7 @@ get_fast_path (const pixman_fast_path_t *fast_paths, if (!valid_mask) continue; - if (info->dest_format != pDst->bits.format) + if (info->dest_format != dst_image->bits.format) continue; if ((info->flags & NEED_PIXBUF) && !is_pixbuf) diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c index f6a1afe..532c0d4 100644 --- a/pixman/pixman-vmx.c +++ b/pixman/pixman-vmx.c @@ -1483,9 +1483,9 @@ vmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op, #if 0 void vmx_CompositeOver_n_8888 (pixman_operator_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -1499,12 +1499,12 @@ vmx_CompositeOver_n_8888 (pixman_operator_t op, uint32_t *dstLine, *dst; int dstStride; - _pixman_image_get_solid (pSrc, pDst, src); + _pixman_image_get_solid (src_image, dst_image, src); if (src >> 24 == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -1516,9 +1516,9 @@ vmx_CompositeOver_n_8888 (pixman_operator_t op, void vmx_CompositeOver_n_0565 (pixman_operator_t op, - pixman_image_t * pSrc, - pixman_image_t * pMask, - pixman_image_t * pDst, + pixman_image_t * src_image, + pixman_image_t * mask_image, + pixman_image_t * dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, @@ -1533,12 +1533,12 @@ vmx_CompositeOver_n_0565 (pixman_operator_t op, uint16_t w; int dstStride; - _pixman_image_get_solid (pSrc, pDst, src); + _pixman_image_get_solid (src_image, dst_image, src); if (src >> 24 == 0) return; - fbComposeGetStart (pDst, xDst, yDst, uint16_t, dstStride, dstLine, 1); + fbComposeGetStart (dst_image, xDst, yDst, uint16_t, dstStride, dstLine, 1); while (height--) { diff --git a/pixman/pixman.c b/pixman/pixman.c index d566972..0c984f7 100644 --- a/pixman/pixman.c +++ b/pixman/pixman.c @@ -76,17 +76,17 @@ pixman_operator_can_be_optimized(pixman_op_t op) * The output operator should be mathematically equivalent to the source. */ static pixman_op_t -pixman_optimize_operator(pixman_op_t op, pixman_image_t *pSrc, pixman_image_t *pMask, pixman_image_t *pDst ) +pixman_optimize_operator(pixman_op_t op, pixman_image_t *src_image, pixman_image_t *mask_image, pixman_image_t *dst_image ) { pixman_bool_t is_source_opaque; pixman_bool_t is_dest_opaque; const optimized_operator_info_t *info = pixman_operator_can_be_optimized(op); - if(!info || pMask) + if(!info || mask_image) return op; - is_source_opaque = _pixman_image_is_opaque(pSrc); - is_dest_opaque = _pixman_image_is_opaque(pDst); + is_source_opaque = _pixman_image_is_opaque(src_image); + is_dest_opaque = _pixman_image_is_opaque(dst_image); if(is_source_opaque == FALSE && is_dest_opaque == FALSE) return op; diff --git a/pixman/pixman.h b/pixman/pixman.h index 289048e..fa8c03f 100644 --- a/pixman/pixman.h +++ b/pixman/pixman.h @@ -812,10 +812,10 @@ pixman_bool_t pixman_image_fill_rectangles (pixman_op_t op, const pixman_rectangle16_t *rects); /* Composite */ -pixman_bool_t pixman_compute_composite_region (pixman_region16_t *pRegion, - pixman_image_t *pSrc, - pixman_image_t *pMask, - pixman_image_t *pDst, +pixman_bool_t pixman_compute_composite_region (pixman_region16_t *region, + pixman_image_t *src_image, + pixman_image_t *mask_image, + pixman_image_t *dst_image, int16_t xSrc, int16_t ySrc, int16_t xMask, -- 2.7.4