From f9bdd1a82c7629a360109bdf4519c73ba5a99225 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sat, 4 Jul 2009 23:13:55 -0400 Subject: [PATCH] Change name fbComposeGetStart to PIXMAN_IMAGE_GET_LINE. --- pixman/pixman-arm-neon.c | 38 ++++++++++++------------ pixman/pixman-arm-simd.c | 16 +++++----- pixman/pixman-fast-path.c | 70 ++++++++++++++++++++++---------------------- pixman/pixman-mmx.c | 74 +++++++++++++++++++++++------------------------ pixman/pixman-private.h | 2 +- pixman/pixman-sse2.c | 74 +++++++++++++++++++++++------------------------ pixman/pixman-vmx.c | 4 +-- 7 files changed, 139 insertions(+), 139 deletions(-) diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c index c1a2cb4..98f35e3 100644 --- a/pixman/pixman-arm-neon.c +++ b/pixman/pixman-arm-neon.c @@ -144,8 +144,8 @@ neon_CompositeAdd_8000_8000 ( int dstStride, srcStride; uint16_t w; - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); if (width>=8) { @@ -294,8 +294,8 @@ neon_composite_over_8888_8888 ( int dstStride, srcStride; uint32_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); if (width>=8) { @@ -457,8 +457,8 @@ neon_composite_over_8888_n_8888 ( uint32_t w; uint8x8_t mask_alpha; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask_alpha = vdup_n_u8((mask) >> 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 (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); if (width>=8) { @@ -861,8 +861,8 @@ neon_CompositeAdd_8888_8_8 ( uint32_t src; uint8x8_t sa; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid (src_image, dst_image->bits.format); sa = vdup_n_u8((src) >> 24); @@ -980,8 +980,8 @@ neon_CompositeSrc_16_16 ( return; /* We simply copy 16-bit-aligned pixels from one place to another. */ - fbComposeGetStart (src_image, src_x, src_y, uint16_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint16_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); /* Preload the first input scanline */ { @@ -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 (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); /* Preload the first input scanline */ { @@ -1754,8 +1754,8 @@ neon_CompositeOver_n_8_0565 ( return; } - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); // keep within minimum number of aligned quadwords on width // while also keeping the minimum number of columns to process @@ -1908,7 +1908,7 @@ neon_CompositeOver_n_0565 ( return; } - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); // keep within minimum number of aligned quadwords on width // while also keeping the minimum number of columns to process @@ -2044,8 +2044,8 @@ neon_CompositeOver_8888_0565 ( return; } - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, 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 7a5b345..71689fe 100644 --- a/pixman/pixman-arm-simd.c +++ b/pixman/pixman-arm-simd.c @@ -51,8 +51,8 @@ arm_CompositeAdd_8000_8000 ( uint16_t w; uint8_t s, d; - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -123,8 +123,8 @@ arm_composite_over_8888_8888 ( uint32_t upper_component_mask = 0xff00ff00; uint32_t alpha_mask = 0xff; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -216,8 +216,8 @@ arm_composite_over_8888_n_8888 ( uint32_t component_half = 0x800080; uint32_t alpha_mask = 0xff; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = (mask) >> 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 (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); while (height--) { diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c index e519078..db8a51c 100644 --- a/pixman/pixman-fast-path.c +++ b/pixman/pixman-fast-path.c @@ -122,9 +122,9 @@ fast_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, uint32_t s, d; uint16_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -183,8 +183,8 @@ fast_CompositeIn_n_8_8 (pixman_implementation_t *imp, srca = src >> 24; - fbComposeGetStart (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (iMask, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (iMask, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); if (srca == 0xff) { while (height--) @@ -261,8 +261,8 @@ fast_CompositeIn_8_8 (pixman_implementation_t *imp, uint8_t s; uint16_t t; - fbComposeGetStart (iSrc, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (iSrc, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (iDst, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -315,8 +315,8 @@ fast_CompositeOver_n_8_8888 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -373,8 +373,8 @@ fast_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); while (height--) { @@ -439,8 +439,8 @@ fast_CompositeOver_n_8_0888 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -502,8 +502,8 @@ fast_CompositeOver_n_8_0565 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); while (height--) { @@ -569,8 +569,8 @@ fast_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, src16 = CONVERT_8888_TO_0565(src); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); while (height--) { @@ -634,8 +634,8 @@ fast_composite_over_8888_8888 (pixman_implementation_t *imp, uint8_t a; uint16_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -680,8 +680,8 @@ fast_CompositeSrc_8888_0888 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 3); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -731,8 +731,8 @@ fast_composite_over_8888_0565 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); while (height--) { @@ -782,8 +782,8 @@ fast_CompositeSrc_x888_0565 (pixman_implementation_t *imp, int dstStride, srcStride; uint16_t w; - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); while (height--) { @@ -824,8 +824,8 @@ fast_CompositeAdd_8000_8000 (pixman_implementation_t *imp, uint8_t s, d; uint16_t t; - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -874,8 +874,8 @@ fast_CompositeAdd_8888_8888 (pixman_implementation_t *imp, uint16_t w; uint32_t s, d; - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -925,8 +925,8 @@ fast_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, uint32_t src; uint8_t sa; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid (src_image, dst_image->bits.format); sa = (src >> 24); @@ -1012,8 +1012,8 @@ fast_CompositeSrc_8888_x888 (pixman_implementation_t *imp, int dstStride, srcStride; uint32_t n_bytes = width * sizeof (uint32_t); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, src, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, src, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1); while (height--) { @@ -1094,10 +1094,10 @@ fast_CompositeSrcScaleNearest (pixman_implementation_t *imp, int i, j; pixman_vector_t v; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dst, 1); /* pass in 0 instead of src_x and src_y because src_x and src_y need to be * transformed from destination space to source space */ - fbComposeGetStart (src_image, 0, 0, uint32_t, srcStride, src, 1); + PIXMAN_IMAGE_GET_LINE (src_image, 0, 0, uint32_t, srcStride, src, 1); /* reference point is the center of the pixel */ v.vector[0] = pixman_int_to_fixed(src_x) + pixman_fixed_1 / 2; diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index 9f4551f..48bb3e3 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -946,7 +946,7 @@ mmx_CompositeOver_n_8888 (pixman_implementation_t *imp, if (src >> 24 == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1025,7 +1025,7 @@ mmx_CompositeOver_n_0565 (pixman_implementation_t *imp, if (src >> 24 == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1112,8 +1112,8 @@ mmx_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, if (srca == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); vsrc = load8888(src); vsrca = expand_alpha(vsrc); @@ -1212,8 +1212,8 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = mask | mask >> 8 | mask >> 16 | mask >> 24; @@ -1297,8 +1297,8 @@ mmx_Composite_over_x888_n_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); mask = mask | mask >> 8 | mask >> 16 | mask >> 24; @@ -1431,8 +1431,8 @@ mmx_composite_over_8888_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { @@ -1482,8 +1482,8 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ @@ -1595,8 +1595,8 @@ mmx_CompositeOver_n_8_8888 (pixman_implementation_t *imp, srcsrc = (uint64_t)src << 32 | src; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1871,8 +1871,8 @@ mmx_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, srcsrc = (uint64_t)src << 32 | src; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -1997,8 +1997,8 @@ mmx_CompositeOver_n_8_0565 (pixman_implementation_t *imp, if (srca == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -2121,8 +2121,8 @@ mmx_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ @@ -2243,8 +2243,8 @@ mmx_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME */ @@ -2350,8 +2350,8 @@ mmx_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, if (srca == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); vsrc = load8888 (src); vsrca = expand_alpha (vsrc); @@ -2452,8 +2452,8 @@ mmx_CompositeIn_n_8_8 (pixman_implementation_t *imp, uint8_t sa; __m64 vsrc, vsrca; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid(src_image, dst_image->bits.format); @@ -2533,8 +2533,8 @@ mmx_CompositeIn_8_8 (pixman_implementation_t *imp, int srcStride, dstStride; uint16_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); while (height--) { @@ -2601,8 +2601,8 @@ mmx_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, uint8_t sa; __m64 vsrc, vsrca; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid(src_image, dst_image->bits.format); @@ -2681,8 +2681,8 @@ mmx_CompositeAdd_8000_8000 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -2753,8 +2753,8 @@ mmx_CompositeAdd_8888_8888 (pixman_implementation_t *imp, CHECKPOINT(); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -2974,9 +2974,9 @@ mmx_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, int srcStride, maskStride, dstStride; uint16_t w; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 1c238df..1dc68da 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -256,7 +256,7 @@ uint32_t _pixman_image_get_solid (pixman_image_t *image, pixman_format_code_t format); -#define fbComposeGetStart(pict,x,y,type,out_stride,line,mul) do { \ +#define PIXMAN_IMAGE_GET_LINE(pict,x,y,type,out_stride,line,mul) do { \ uint32_t *__bits__; \ int __stride__; \ \ diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index 3ebabe3..d8fb187 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -2523,7 +2523,7 @@ sse2_CompositeOver_n_8888 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2610,7 +2610,7 @@ sse2_CompositeOver_n_0565 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2705,8 +2705,8 @@ sse2_CompositeOver_n_8888_8888_ca (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); xmmSrc = _mm_unpacklo_epi8 (createMask_2x32_128 (src, src), _mm_setzero_si128 ()); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -2833,8 +2833,8 @@ sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp, __m128i xmmDst, xmmDstLo, xmmDstHi; __m128i xmmAlphaLo, xmmAlphaHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); xmmMask = createMask_16_128 (mask >> 24); @@ -2945,8 +2945,8 @@ sse2_Composite_over_x888_n_8888 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); mask = _pixman_image_get_solid (mask_image, dst_image->bits.format); xmmMask = createMask_16_128 (mask >> 24); @@ -3052,8 +3052,8 @@ sse2_composite_over_8888_8888 (pixman_implementation_t *imp, uint32_t *dstLine, *dst; uint32_t *srcLine, *src; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); dst = dstLine; src = srcLine; @@ -3106,8 +3106,8 @@ sse2_composite_over_8888_0565 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -3230,8 +3230,8 @@ sse2_CompositeOver_n_8_8888 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); xmmDef = createMask_2x32_128 (src, src); xmmSrc = expandPixel_32_1x128 (src); @@ -3510,8 +3510,8 @@ sse2_CompositeSrc_n_8_8888 (pixman_implementation_t *imp, return; } - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); xmmDef = createMask_2x32_128 (src, src); xmmSrc = expandPixel_32_1x128 (src); @@ -3643,8 +3643,8 @@ sse2_CompositeOver_n_8_0565 (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -3785,8 +3785,8 @@ sse2_Composite_over_pixbuf_0565 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDst0, xmmDst1, xmmDst2, xmmDst3; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -3919,8 +3919,8 @@ sse2_Composite_over_pixbuf_8888 (pixman_implementation_t *imp, __m128i xmmSrcLo, xmmSrcHi; __m128i xmmDstLo, xmmDstHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); #if 0 /* FIXME @@ -4043,8 +4043,8 @@ sse2_CompositeOver_n_8888_0565_ca (pixman_implementation_t *imp, if (src == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint32_t, maskStride, maskLine, 1); xmmSrc = expandPixel_32_1x128 (src); xmmAlpha = expandAlpha_1x128 (xmmSrc); @@ -4184,8 +4184,8 @@ sse2_CompositeIn_n_8_8 (pixman_implementation_t *imp, __m128i xmmMask, xmmMaskLo, xmmMaskHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid(src_image, dst_image->bits.format); @@ -4285,8 +4285,8 @@ sse2_CompositeIn_8_8 (pixman_implementation_t *imp, __m128i xmmSrc, xmmSrcLo, xmmSrcHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); while (height--) { @@ -4378,8 +4378,8 @@ sse2_CompositeAdd_8888_8_8 (pixman_implementation_t *imp, __m128i xmmMask, xmmMaskLo, xmmMaskHi; __m128i xmmDst, xmmDstLo, xmmDstHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); src = _pixman_image_get_solid(src_image, dst_image->bits.format); @@ -4478,8 +4478,8 @@ sse2_CompositeAdd_8000_8000 (pixman_implementation_t *imp, uint16_t w; uint16_t t; - fbComposeGetStart (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint8_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint8_t, dstStride, dstLine, 1); while (height--) { @@ -4543,8 +4543,8 @@ sse2_CompositeAdd_8888_8888 (pixman_implementation_t *imp, uint32_t *srcLine, *src; int dstStride, srcStride; - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -4754,9 +4754,9 @@ sse2_CompositeOver_x888_8_8888 (pixman_implementation_t *imp, __m128i xmmDst, xmmDstLo, xmmDstHi; __m128i xmmMask, xmmMaskLo, xmmMaskHi; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); - fbComposeGetStart (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); - fbComposeGetStart (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (mask_image, mask_x, mask_y, uint8_t, maskStride, maskLine, 1); + PIXMAN_IMAGE_GET_LINE (src_image, src_x, src_y, uint32_t, srcStride, srcLine, 1); while (height--) { diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c index 608334c..94c31c8 100644 --- a/pixman/pixman-vmx.c +++ b/pixman/pixman-vmx.c @@ -1504,7 +1504,7 @@ vmx_CompositeOver_n_8888 (pixman_operator_t op, if (src >> 24 == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint32_t, dstStride, dstLine, 1); while (height--) { @@ -1538,7 +1538,7 @@ vmx_CompositeOver_n_0565 (pixman_operator_t op, if (src >> 24 == 0) return; - fbComposeGetStart (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); + PIXMAN_IMAGE_GET_LINE (dst_image, dest_x, dest_y, uint16_t, dstStride, dstLine, 1); while (height--) { -- 2.7.4