WebSVN – Kolibri OS – Diff – /programs/develop/libraries/pixman/pixman.c

 #endif
 #include "pixman-private.h"
-#include
-static force_inline pixman_implementation_t *
-get_implementation (void)
+#include
-{
+pixman_implementation_t *global_implementation;
+#ifdef TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR
-    static pixman_implementation_t *global_implementation;
+static void __attribute__((constructor))
-    if (!global_implementation)
-	global_implementation = _pixman_choose_implementation ();
+pixman_constructor (void)
+{
     global_implementation = _pixman_choose_implementation ();
     return global_implementation;
 #endif
     is_source_opaque >>= OPAQUE_SHIFT;
     return operator_table[op].opaque_info[is_dest_opaque | is_source_opaque];
-}
-static void
-apply_workaround (pixman_image_t *image,
-		  int32_t *       x,
-		  int32_t *       y,
-		  uint32_t **     save_bits,
-		  int *           save_dx,
-		  int *           save_dy)
-{
-    if (image && (image->common.flags & FAST_PATH_NEEDS_WORKAROUND))
-    {
-	/* Some X servers generate images that point to the
-	 * wrong place in memory, but then set the clip region
-	 * to point to the right place. Because of an old bug
-	 * in pixman, this would actually work.
-	 *
-	 * Here we try and undo the damage
-	 */
-	int bpp = PIXMAN_FORMAT_BPP (image->bits.format) / 8;
-	pixman_box32_t *extents;
-	uint8_t *t;
-	int dx, dy;
-	extents = pixman_region32_extents (&(image->common.clip_region));
-	dx = extents->x1;
-	dy = extents->y1;
-	*save_bits = image->bits.bits;
-	*x -= dx;
-	*y -= dy;
-	pixman_region32_translate (&(image->common.clip_region), -dx, -dy);
-	t = (uint8_t *)image->bits.bits;
-	t += dy * image->bits.rowstride * 4 + dx * bpp;
-	image->bits.bits = (uint32_t *)t;
-	*save_dx = dx;
-	*save_dy = dy;
-    }
-}
-static void
-unapply_workaround (pixman_image_t *image, uint32_t *bits, int dx, int dy)
-{
-    if (image && (image->common.flags & FAST_PATH_NEEDS_WORKAROUND))
-    {
-	image->bits.bits = bits;
-	pixman_region32_translate (&image->common.clip_region, dx, dy);
-    }
+}
 /*
  * Computing composite region
  */
 /*
  * returns FALSE if the final region is empty.  Indistinguishable from
  * an allocation failure, but rendering ignores those anyways.
  */
-static pixman_bool_t
+pixman_bool_t
-pixman_compute_composite_region32 (pixman_region32_t * region,
+_pixman_compute_composite_region32 (pixman_region32_t * region,
-                                   pixman_image_t *    src_image,
+				    pixman_image_t *    src_image,
-                                   pixman_image_t *    mask_image,
+				    pixman_image_t *    mask_image,
-                                   pixman_image_t *    dst_image,
+				    pixman_image_t *    dest_image,
-                                   int32_t             src_x,
+				    int32_t             src_x,
-                                   int32_t             src_y,
+				    int32_t             src_y,
-                                   int32_t             mask_x,
+				    int32_t             mask_x,
-                                   int32_t             mask_y,
+				    int32_t             mask_y,
     region->extents.y1 = dest_y;
     region->extents.y2 = dest_y + height;
     region->extents.x1 = MAX (region->extents.x1, 0);
     region->extents.y1 = MAX (region->extents.y1, 0);
-    region->extents.x2 = MIN (region->extents.x2, dst_image->bits.width);
+    region->extents.x2 = MIN (region->extents.x2, dest_image->bits.width);
-    region->extents.y2 = MIN (region->extents.y2, dst_image->bits.height);
+    region->extents.y2 = MIN (region->extents.y2, dest_image->bits.height);
     region->data = 0;
 	region->extents.y1 = 0;
 	region->extents.y2 = 0;
 	return FALSE;
+    }
-    if (dst_image->common.have_clip_region)
+    if (dest_image->common.have_clip_region)
     {
-	if (!clip_general_image (region, &dst_image->common.clip_region, 0, 0))
+	if (!clip_general_image (region, &dest_image->common.clip_region, 0, 0))
 	    return FALSE;
     }
-    if (dst_image->common.alpha_map)
+    if (dest_image->common.alpha_map)
     {
 	if (!pixman_region32_intersect_rect (region, region,
-					     dst_image->common.alpha_origin_x,
+					     dest_image->common.alpha_origin_x,
-					     dst_image->common.alpha_origin_y,
+					     dest_image->common.alpha_origin_y,
-					     dst_image->common.alpha_map->width,
+					     dest_image->common.alpha_map->width,
-					     dst_image->common.alpha_map->height))
+					     dest_image->common.alpha_map->height))
+	{
 	    return FALSE;
+	}
 	if (!pixman_region32_not_empty (region))
 	    return FALSE;
-	if (dst_image->common.alpha_map->common.have_clip_region)
+	if (dest_image->common.alpha_map->common.have_clip_region)
 	{
-	    if (!clip_general_image (region, &dst_image->common.alpha_map->common.clip_region,
+	    if (!clip_general_image (region, &dest_image->common.alpha_map->common.clip_region,
-				     -dst_image->common.alpha_origin_x,
+				     -dest_image->common.alpha_origin_x,
-				     -dst_image->common.alpha_origin_y))
+				     -dest_image->common.alpha_origin_y))
+	    {
 		return FALSE;
+	    }
+    }
     return TRUE;
-}
 #define N_CACHED_FAST_PATHS 8
-typedef struct
-{
-    struct
+typedef struct
-    {
-	pixman_implementation_t *	imp;
-	pixman_fast_path_t		fast_path;
-    } cache [N_CACHED_FAST_PATHS];
-} cache_t;
-PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);
-static force_inline pixman_bool_t
+{
-lookup_composite_function (pixman_op_t			op,
-			   pixman_format_code_t		src_format,
-			   uint32_t			src_flags,
-			   pixman_format_code_t		mask_format,
+    pixman_fixed_48_16_t	x1;
-			   uint32_t			mask_flags,
-			   pixman_format_code_t		dest_format,
-			   uint32_t			dest_flags,
-			   pixman_implementation_t    **out_imp,
-			   pixman_composite_func_t     *out_func)
+    pixman_fixed_48_16_t	y1;
-{
-    pixman_implementation_t *imp;
-    cache_t *cache;
-    int i;
-    /* Check cache for fast paths */
-    cache = PIXMAN_GET_THREAD_LOCAL (fast_path_cache);
-    for (i = 0; i < N_CACHED_FAST_PATHS; ++i)
-    {
-	const pixman_fast_path_t *info = &(cache->cache[i].fast_path);
-	/* Note that we check for equality here, not whether
-	 * the cached fast path matches. This is to prevent
-	 * us from selecting an overly general fast path
-	 * when a more specific one would work.
-	 */
-	if (info->op == op			&&
-	    info->src_format == src_format	&&
-	    info->mask_format == mask_format	&&
-	    info->dest_format == dest_format	&&
-	    info->src_flags == src_flags	&&
-	    info->mask_flags == mask_flags	&&
-	    info->dest_flags == dest_flags	&&
-	    info->func)
-	{
-	    *out_imp = cache->cache[i].imp;
-	    *out_func = cache->cache[i].fast_path.func;
-	    goto update_cache;
-	}
-    }
-    for (imp = get_implementation (); imp != NULL; imp = imp->delegate)
-    {
-	const pixman_fast_path_t *info = imp->fast_paths;
-	while (info->op != PIXMAN_OP_NONE)
-	{
-	    if ((info->op == op || info->op == PIXMAN_OP_any)		&&
-		/* Formats */
-		((info->src_format == src_format) ||
-		 (info->src_format == PIXMAN_any))			&&
-		((info->mask_format == mask_format) ||
-		 (info->mask_format == PIXMAN_any))			&&
-		((info->dest_format == dest_format) ||
-		 (info->dest_format == PIXMAN_any))			&&
-		/* Flags */
-		(info->src_flags & src_flags) == info->src_flags	&&
-		(info->mask_flags & mask_flags) == info->mask_flags	&&
-		(info->dest_flags & dest_flags) == info->dest_flags)
-	    {
-		*out_imp = imp;
-		*out_func = info->func;
-		/* Set i to the last spot in the cache so that the
-		 * move-to-front code below will work
-		 */
-		i = N_CACHED_FAST_PATHS - 1;
-		goto update_cache;
-	    }
+    pixman_fixed_48_16_t	x2;
-	    ++info;
-	}
-    }
-    return FALSE;
-update_cache:
-    if (i)
-    {
-	while (i--)
-	    cache->cache[i + 1] = cache->cache[i];
-	cache->cache[0].imp = *out_imp;
-	cache->cache[0].fast_path.op = op;
-	cache->cache[0].fast_path.src_format = src_format;
-	cache->cache[0].fast_path.src_flags = src_flags;
-	cache->cache[0].fast_path.mask_format = mask_format;
-	cache->cache[0].fast_path.mask_flags = mask_flags;
-	cache->cache[0].fast_path.dest_format = dest_format;
-	cache->cache[0].fast_path.dest_flags = dest_flags;
-	cache->cache[0].fast_path.func = *out_func;
-    }
-    return TRUE;
+    pixman_fixed_48_16_t	y2;
-}
+} box_48_16_t;
 static pixman_bool_t
-compute_sample_extents (pixman_transform_t *transform,
-			pixman_box32_t *extents, int x, int y,
+compute_transformed_extents (pixman_transform_t *transform,
-			pixman_fixed_t x_off, pixman_fixed_t y_off,
-			pixman_fixed_t width, pixman_fixed_t height)
+			     const pixman_box32_t *extents,
+			     box_48_16_t *transformed)
+{
-{
-    pixman_fixed_t x1, y1, x2, y2;
+    pixman_fixed_48_16_t tx1, ty1, tx2, ty2;
-    pixman_fixed_48_16_t tx1, ty1, tx2, ty2;
+    pixman_fixed_t x1, y1, x2, y2;
+    int i;
-    /* We have checked earlier that (extents->x1 - x) etc. fit in a pixman_fixed_t */
-    x1 = (pixman_fixed_48_16_t)pixman_int_to_fixed (extents->x1 - x) + pixman_fixed_1 / 2;
+    x1 = pixman_int_to_fixed (extents->x1) + pixman_fixed_1 / 2;
-    y1 = (pixman_fixed_48_16_t)pixman_int_to_fixed (extents->y1 - y) + pixman_fixed_1 / 2;
+    y1 = pixman_int_to_fixed (extents->y1) + pixman_fixed_1 / 2;
-    x2 = (pixman_fixed_48_16_t)pixman_int_to_fixed (extents->x2 - x) - pixman_fixed_1 / 2;
+    x2 = pixman_int_to_fixed (extents->x2) - pixman_fixed_1 / 2;
-    y2 = (pixman_fixed_48_16_t)pixman_int_to_fixed (extents->y2 - y) - pixman_fixed_1 / 2;
+    y2 = pixman_int_to_fixed (extents->y2) - pixman_fixed_1 / 2;
     if (!transform)
+    {
+	transformed->x1 = x1;
 	transformed->y1 = y1;
-	tx1 = (pixman_fixed_48_16_t)x1;
-	ty1 = (pixman_fixed_48_16_t)y1;
-	tx2 = (pixman_fixed_48_16_t)x2;
-	ty2 = (pixman_fixed_48_16_t)y2;
+	transformed->x2 = x2;
-    }
+	transformed->y2 = y2;
     else
 	return TRUE;
 	int i;
-		return FALSE;
+	    return FALSE;
-	    tx = (pixman_fixed_48_16_t)v.vector[0];
+	tx = (pixman_fixed_48_16_t)v.vector[0];
-	    ty = (pixman_fixed_48_16_t)v.vector[1];
-	    if (i == 0)
-	    {
-		tx1 = tx;
-		ty1 = ty;
-		tx2 = tx;
-		ty2 = ty;
-	    }
-	    else
+	ty = (pixman_fixed_48_16_t)v.vector[1];
-		if (tx < tx1)
+	if (tx < tx1)
-		    tx1 = tx;
+	    tx1 = tx;
-		if (ty < ty1)
+	if (ty < ty1)
-		    ty1 = ty;
+	    ty1 = ty;
-		if (tx > tx2)
+	if (tx > tx2)
-		    tx2 = tx;
+	    tx2 = tx;
-		if (ty > ty2)
+	if (ty > ty2)
-		    ty2 = ty;
-	    }
-	}
-    }
-    /* Expand the source area by a tiny bit so account of different rounding that
-     * may happen during sampling. Note that (8 * pixman_fixed_e) is very far from
+	    ty2 = ty;
-     * 0.5 so this won't cause the area computed to be overly pessimistic.
+    }
-     */
-    tx1 += x_off - 8 * pixman_fixed_e;
-    ty1 += y_off - 8 * pixman_fixed_e;
-    tx2 += x_off + width + 8 * pixman_fixed_e;
-    ty2 += y_off + height + 8 * pixman_fixed_e;
-    if (tx1 < pixman_min_fixed_48_16 || tx1 > pixman_max_fixed_48_16 ||
-	ty1 < pixman_min_fixed_48_16 || ty1 > pixman_max_fixed_48_16 ||
-	tx2 < pixman_min_fixed_48_16 || tx2 > pixman_max_fixed_48_16 ||
-	ty2 < pixman_min_fixed_48_16 || ty2 > pixman_max_fixed_48_16)
-    {
-	return FALSE;
-    }
-    else
+    transformed->x1 = tx1;
-    {
-	extents->x1 = pixman_fixed_to_int (tx1);
-	extents->y1 = pixman_fixed_to_int (ty1);
+    transformed->y1 = ty1;
-	extents->x2 = pixman_fixed_to_int (tx2) + 1;
+    transformed->x2 = tx2;
-	extents->y2 = pixman_fixed_to_int (ty2) + 1;
     transformed->y2 = ty2;
+    return TRUE;
 	return TRUE;
-    }
-}
+#define IS_16BIT(x) (((x) >= INT16_MIN) && ((x) <= INT16_MAX))
+#define ABS(f)      (((f) < 0)?  (-(f)) : (f))
 #define IS_16_16(f) (((f) >= pixman_min_fixed_48_16 && ((f) <= pixman_max_fixed_48_16)))
 #define IS_16BIT(x) (((x) >= INT16_MIN) && ((x) <= INT16_MAX))
 static pixman_bool_t
-analyze_extent (pixman_image_t *image, int x, int y,
+analyze_extent (pixman_image_t       *image,
+		const pixman_box32_t *extents,
+		uint32_t             *flags)
-		const pixman_box32_t *extents, uint32_t *flags)
+{
     pixman_transform_t *transform;
-    pixman_transform_t *transform;
+    pixman_fixed_t x_off, y_off;
-    pixman_fixed_t *params;
+    pixman_fixed_t width, height;
-    pixman_fixed_t x_off, y_off;
+    pixman_fixed_t *params;
-    pixman_fixed_t width, height;
+    box_48_16_t transformed;
-    pixman_box32_t ex;
+    pixman_box32_t exp_extents;
     if (!image)
 	return TRUE;
     /* Some compositing functions walk one step
      * outside the destination rectangle, so we
      * check here that the expanded-by-one source
      * extents in destination space fits in 16 bits
      */
 	 * them to be smaller than 16 bits.
 	 */
 	if (image->bits.width >= 0x7fff	|| image->bits.height >= 0x7fff)
 	    return FALSE;
-#define ID_AND_NEAREST (FAST_PATH_ID_TRANSFORM | FAST_PATH_NEAREST_FILTER)
-	if ((image->common.flags & ID_AND_NEAREST) == ID_AND_NEAREST &&
+	if ((image->common.flags & FAST_PATH_ID_TRANSFORM) == FAST_PATH_ID_TRANSFORM &&
-	    extents->x1 - x >= 0 &&
+	    extents->x1 >= 0 &&
-	    extents->y1 - y >= 0 &&
+	    extents->y1 >= 0 &&
-	    extents->x2 - x <= image->bits.width &&
+	    extents->x2 <= image->bits.width &&
-	    extents->y2 - y <= image->bits.height)
+	    extents->y2 <= image->bits.height)
 	{
-	    *flags |= FAST_PATH_SAMPLES_COVER_CLIP;
+	    *flags |= FAST_PATH_SAMPLES_COVER_CLIP_NEAREST;
 	    return TRUE;
+	}
 	    y_off = - pixman_fixed_e - ((params[1] - pixman_fixed_1) >> 1);
 	    width = params[0];
 	    height = params[1];
 	    break;
+	case PIXMAN_FILTER_SEPARABLE_CONVOLUTION:
+	    params = image->common.filter_params;
+	    x_off = - pixman_fixed_e - ((params[0] - pixman_fixed_1) >> 1);
+	    y_off = - pixman_fixed_e - ((params[1] - pixman_fixed_1) >> 1);
+	    width = params[0];
+	    height = params[1];
+	    break;
 	case PIXMAN_FILTER_GOOD:
 	case PIXMAN_FILTER_BEST:
 	case PIXMAN_FILTER_BILINEAR:
 	    x_off = - pixman_fixed_1 / 2;
 	    break;
 	default:
 	    return FALSE;
-	}
-	/* Check whether the non-expanded, transformed extent is entirely within
-	 * the source image, and set the FAST_PATH_SAMPLES_COVER_CLIP if it is.
-	 */
-	ex = *extents;
-	if (compute_sample_extents (transform, &ex, x, y, x_off, y_off, width, height) &&
-	    ex.x1 >= 0 && ex.y1 >= 0 &&
-	    ex.x2 <= image->bits.width && ex.y2 <= image->bits.height)
-	{
-	    *flags |= FAST_PATH_SAMPLES_COVER_CLIP;
+	}
+    }
     else
+    {
 	x_off = 0;
 	y_off = 0;
 	width = 0;
 	height = 0;
+    }
+    if (!compute_transformed_extents (transform, extents, &transformed))
-    }
+	return FALSE;
-    /* Check that the extents expanded by one don't overflow. This ensures that
+    /* Expand the source area by a tiny bit so account of different rounding that
-     * compositing functions can simply walk the source space using 16.16
+     * may happen during sampling. Note that (8 * pixman_fixed_e) is very far from
-     * variables without worrying about overflow.
+     * 0.5 so this won't cause the area computed to be overly pessimistic.
      */
-    ex.x1 = extents->x1 - 1;
+    transformed.x1 -= 8 * pixman_fixed_e;
-    ex.y1 = extents->y1 - 1;
+    transformed.y1 -= 8 * pixman_fixed_e;
+    transformed.x2 += 8 * pixman_fixed_e;
+    transformed.y2 += 8 * pixman_fixed_e;
+    if (image->common.type == BITS)
+    {
+	if (pixman_fixed_to_int (transformed.x1) >= 0			&&
+	    pixman_fixed_to_int (transformed.y1) >= 0			&&
+	    pixman_fixed_to_int (transformed.x2) < image->bits.width	&&
+	    pixman_fixed_to_int (transformed.y2) < image->bits.height)
+	{
+	    *flags |= FAST_PATH_SAMPLES_COVER_CLIP_NEAREST;
+	}
+	if (pixman_fixed_to_int (transformed.x1 - pixman_fixed_1 / 2) >= 0		  &&
+	    pixman_fixed_to_int (transformed.y1 - pixman_fixed_1 / 2) >= 0		  &&
+	    pixman_fixed_to_int (transformed.x2 + pixman_fixed_1 / 2) < image->bits.width &&
+	    pixman_fixed_to_int (transformed.y2 + pixman_fixed_1 / 2) < image->bits.height)
+	{
+	    *flags |= FAST_PATH_SAMPLES_COVER_CLIP_BILINEAR;
+	}
+    }
+    /* Check we don't overflow when the destination extents are expanded by one.
+     * This ensures that compositing functions can simply walk the source space
+     * using 16.16 variables without worrying about overflow.
+     */
+    exp_extents = *extents;
+    exp_extents.x1 -= 1;
+    exp_extents.y1 -= 1;
-    ex.x2 = extents->x2 + 1;
+    exp_extents.x2 += 1;
-    ex.y2 = extents->y2 + 1;
+    exp_extents.y2 += 1;
+    if (!compute_transformed_extents (transform, &exp_extents, &transformed))
+	return FALSE;
+    if (!IS_16_16 (transformed.x1 + x_off - 8 * pixman_fixed_e)	||
+	!IS_16_16 (transformed.y1 + y_off - 8 * pixman_fixed_e)	||
+	!IS_16_16 (transformed.x2 + x_off + 8 * pixman_fixed_e + width)	||
+	!IS_16_16 (transformed.y2 + y_off + 8 * pixman_fixed_e + height))
+    {
-    if (!compute_sample_extents (transform, &ex, x, y, x_off, y_off, width, height))
+	return FALSE;
 	return FALSE;
                           int32_t          dest_y,
                           int32_t          width,
                           int32_t          height)
+{
     pixman_format_code_t src_format, mask_format, dest_format;
-    uint32_t src_flags, mask_flags, dest_flags;
     pixman_region32_t region;
-    pixman_box32_t *extents;
+    pixman_box32_t extents;
-    uint32_t *src_bits;
-    int src_dx, src_dy;
-    uint32_t *mask_bits;
-    int mask_dx, mask_dy;
-    uint32_t *dest_bits;
-    int dest_dx, dest_dy;
-    pixman_bool_t need_workaround;
     pixman_implementation_t *imp;
     pixman_composite_func_t func;
+    pixman_composite_info_t info;
+    const pixman_box32_t *pbox;
+    int n;
     _pixman_image_validate (src);
     if (mask)
 	_pixman_image_validate (mask);
     _pixman_image_validate (dest);
     src_format = src->common.extended_format_code;
-    src_flags = src->common.flags;
+    info.src_flags = src->common.flags;
-    if (mask)
+    if (mask && !(mask->common.flags & FAST_PATH_IS_OPAQUE))
+    {
 	mask_format = mask->common.extended_format_code;
-	mask_flags = mask->common.flags;
+	info.mask_flags = mask->common.flags;
+    }
     else
+    {
 	mask_format = PIXMAN_null;
-	mask_flags = FAST_PATH_IS_OPAQUE;
+	info.mask_flags = FAST_PATH_IS_OPAQUE;
+    }
     dest_format = dest->common.extended_format_code;
-    dest_flags = dest->common.flags;
+    info.dest_flags = dest->common.flags;
     /* Check for pixbufs */
-    /* Check for pixbufs */
+    if ((mask_format == PIXMAN_a8r8g8b8 || mask_format == PIXMAN_a8b8g8r8) &&
-    if ((mask_format == PIXMAN_a8r8g8b8 || mask_format == PIXMAN_a8b8g8r8) &&
+	(src->type == BITS && src->bits.bits == mask->bits.bits)	   &&
-	(src->type == BITS && src->bits.bits == mask->bits.bits)	   &&
+	(src->common.repeat == mask->common.repeat)			   &&
-	(src->common.repeat == mask->common.repeat)			   &&
+	(info.src_flags & info.mask_flags & FAST_PATH_ID_TRANSFORM)	   &&
 	(src_x == mask_x && src_y == mask_y))
+    {
-	if (src_format == PIXMAN_x8b8g8r8)
-	    src_format = mask_format = PIXMAN_pixbuf;
-	else if (src_format == PIXMAN_x8r8g8b8)
-	    src_format = mask_format = PIXMAN_rpixbuf;
-    }
-    /* Check for workaround */
-    need_workaround = (src_flags | mask_flags | dest_flags) & FAST_PATH_NEEDS_WORKAROUND;
-    if (need_workaround)
 	if (src_format == PIXMAN_x8b8g8r8)
-	apply_workaround (src, &src_x, &src_y, &src_bits, &src_dx, &src_dy);
+	    src_format = mask_format = PIXMAN_pixbuf;
-	apply_workaround (mask, &mask_x, &mask_y, &mask_bits, &mask_dx, &mask_dy);
+	else if (src_format == PIXMAN_x8r8g8b8)
-	apply_workaround (dest, &dest_x, &dest_y, &dest_bits, &dest_dx, &dest_dy);
+	    src_format = mask_format = PIXMAN_rpixbuf;
+    }
     pixman_region32_init (®ion);
+    if (!_pixman_compute_composite_region32 (
+	    ®ion, src, mask, dest,
+	    src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
+    {
+	goto out;
-    if (!pixman_compute_composite_region32 (
+    }
 	    ®ion, src, mask, dest,
+    extents = *pixman_region32_extents (®ion);
+    extents.x1 -= dest_x - src_x;
+    extents.y1 -= dest_y - src_y;
+    extents.x2 -= dest_x - src_x;
-	    src_x, src_y, mask_x, mask_y, dest_x, dest_y, width, height))
+    extents.y2 -= dest_y - src_y;
-	goto out;
+    if (!analyze_extent (src, &extents, &info.src_flags))
-    }
+	goto out;
+    extents.x1 -= src_x - mask_x;
+    extents.y1 -= src_y - mask_y;
+    extents.x2 -= src_x - mask_x;
-    extents = pixman_region32_extents (®ion);
+    extents.y2 -= src_y - mask_y;
+    if (!analyze_extent (mask, &extents, &info.mask_flags))
+	goto out;
+    /* If the clip is within the source samples, and the samples are
-    if (!analyze_extent (src, dest_x - src_x, dest_y - src_y, extents, &src_flags))
+     * opaque, then the source is effectively opaque.
+     */
-	goto out;
+#define NEAREST_OPAQUE	(FAST_PATH_SAMPLES_OPAQUE |			\
+			 FAST_PATH_NEAREST_FILTER |			\
+			 FAST_PATH_SAMPLES_COVER_CLIP_NEAREST)
+#define BILINEAR_OPAQUE	(FAST_PATH_SAMPLES_OPAQUE |			\
+			 FAST_PATH_BILINEAR_FILTER |			\
-    if (!analyze_extent (mask, dest_x - mask_x, dest_y - mask_y, extents, &mask_flags))
+			 FAST_PATH_SAMPLES_COVER_CLIP_BILINEAR)
 	goto out;
     if ((info.src_flags & NEAREST_OPAQUE) == NEAREST_OPAQUE ||
-    /* If the clip is within the source samples, and the samples are opaque,
+	(info.src_flags & BILINEAR_OPAQUE) == BILINEAR_OPAQUE)
      * then the source is effectively opaque.
-     */
+	info.src_flags |= FAST_PATH_IS_OPAQUE;
-#define BOTH (FAST_PATH_SAMPLES_OPAQUE | FAST_PATH_SAMPLES_COVER_CLIP)
-    if ((src_flags & BOTH) == BOTH)
+    }
-	src_flags |= FAST_PATH_IS_OPAQUE;
+    if ((info.mask_flags & NEAREST_OPAQUE) == NEAREST_OPAQUE ||
+	(info.mask_flags & BILINEAR_OPAQUE) == BILINEAR_OPAQUE)
-    if ((mask_flags & BOTH) == BOTH)
+    {
-	mask_flags |= FAST_PATH_IS_OPAQUE;
+	info.mask_flags |= FAST_PATH_IS_OPAQUE;
+    }
     /*
      * Check if we can replace our operator by a simpler one
      * if the src or dest are opaque. The output operator should be
      * mathematically equivalent to the source.
      */
-    op = optimize_operator (op, src_flags, mask_flags, dest_flags);
-    if (op == PIXMAN_OP_DST)
-	goto out;
+    info.op = optimize_operator (op, info.src_flags, info.mask_flags, info.dest_flags);
-    if (lookup_composite_function (op,
+    _pixman_implementation_lookup_composite (
-				   src_format, src_flags,
+	get_implementation (), info.op,
-				   mask_format, mask_flags,
+	src_format, info.src_flags,
-				   dest_format, dest_flags,
+	mask_format, info.mask_flags,
-				   &imp, &func))
+	dest_format, info.dest_flags,
-    {
+	&imp, &func);
+    info.src_image = src;
-	const pixman_box32_t *pbox;
+    info.mask_image = mask;
-	int n;
+    info.dest_image = dest;
 	pbox = pixman_region32_rectangles (®ion, &n);
-	while (n--)
-	{
-	    func (imp, op,
-		  src, mask, dest,
-		  pbox->x1 + src_x - dest_x,
-		  pbox->y1 + src_y - dest_y,
-		  pbox->x1 + mask_x - dest_x,
+    pbox = pixman_region32_rectangles (®ion, &n);
 		  pbox->y1 + mask_y - dest_y,
-		  pbox->x1,
+    while (n--)
 		  pbox->y1,
             int       dst_stride,
             int       src_bpp,
             int       dst_bpp,
             int       src_x,
             int       src_y,
-            int       dst_x,
+            int       dest_x,
-            int       dst_y,
+            int       dest_y,
             int       width,
             int       height)
+{
     return _pixman_implementation_blt (get_implementation(),
 				       src_bits, dst_bits, src_stride, dst_stride,
                                        src_bpp, dst_bpp,
                                        src_x, src_y,
-                                       dst_x, dst_y,
+                                       dest_x, dest_y,
                                        width, height);
+}
 PIXMAN_EXPORT pixman_bool_t
              int       bpp,
              int       x,
              int       y,
              int       width,
              int       height,
-             uint32_t xor)
+             uint32_t  filler)
+{
     return _pixman_implementation_fill (
-	get_implementation(), bits, stride, bpp, x, y, width, height, xor);
+	get_implementation(), bits, stride, bpp, x, y, width, height, filler);
+}
 static uint32_t
 color_to_uint32 (const pixman_color_t *color)
         (color->green & 0xff00) |
         (color->blue >> 8);
+}
 static pixman_bool_t
-color_to_pixel (pixman_color_t *     color,
+color_to_pixel (const pixman_color_t *color,
-                uint32_t *           pixel,
+                uint32_t *            pixel,
-                pixman_format_code_t format)
+                pixman_format_code_t  format)
+{
           format == PIXMAN_x8r8g8b8     ||
           format == PIXMAN_a8b8g8r8     ||
           format == PIXMAN_x8b8g8r8     ||
           format == PIXMAN_b8g8r8a8     ||
           format == PIXMAN_b8g8r8x8     ||
+          format == PIXMAN_r8g8b8a8     ||
+          format == PIXMAN_r8g8b8x8     ||
           format == PIXMAN_r5g6b5       ||
           format == PIXMAN_b5g6r5       ||
+          format == PIXMAN_a8           ||
-          format == PIXMAN_a8))
+          format == PIXMAN_a1))
+    {
 	return FALSE;
+    }
 	c = ((c & 0xff000000) >> 24) |
 	    ((c & 0x00ff0000) >>  8) |
 	    ((c & 0x0000ff00) <<  8) |
 	    ((c & 0x000000ff) << 24);
+    }
+    if (PIXMAN_FORMAT_TYPE (format) == PIXMAN_TYPE_RGBA)
+	c = ((c & 0xff000000) >> 24) | (c << 8);
+    if (format == PIXMAN_a1)
+	c = c >> 31;
-    if (format == PIXMAN_a8)
+    else if (format == PIXMAN_a8)
 	c = c >> 24;
     else if (format == PIXMAN_r5g6b5 ||
              format == PIXMAN_b5g6r5)
-	c = CONVERT_8888_TO_0565 (c);
+	c = convert_8888_to_0565 (c);
 #if 0
     printf ("color: %x %x %x %x\n", color->alpha, color->red, color->green, color->blue);
+}
 PIXMAN_EXPORT pixman_bool_t
 pixman_image_fill_rectangles (pixman_op_t                 op,
                               pixman_image_t *            dest,
-                              pixman_color_t *            color,
+			      const pixman_color_t *      color,
                               int                         n_rects,
                               const pixman_rectangle16_t *rects)
+{
     pixman_box32_t stack_boxes[6];
+}
 PIXMAN_EXPORT pixman_bool_t
 pixman_image_fill_boxes (pixman_op_t           op,
                          pixman_image_t *      dest,
-                         pixman_color_t *      color,
+                         const pixman_color_t *color,
                          int                   n_boxes,
                          const pixman_box32_t *boxes)
+{
     pixman_image_t *solid;
     case PIXMAN_a2b10g10r10:
     case PIXMAN_x2b10g10r10:
     case PIXMAN_a2r10g10b10:
     case PIXMAN_x2r10g10b10:
     case PIXMAN_a8r8g8b8:
+    case PIXMAN_a8r8g8b8_sRGB:
     case PIXMAN_x8r8g8b8:
     case PIXMAN_a8b8g8r8:
     case PIXMAN_x8b8g8r8:
     case PIXMAN_b8g8r8a8:
     case PIXMAN_b8g8r8x8:
+    case PIXMAN_r8g8b8a8:
+    case PIXMAN_r8g8b8x8:
     case PIXMAN_r8g8b8:
     case PIXMAN_b8g8r8:
     case PIXMAN_r5g6b5:
     case PIXMAN_b5g6r5:
     case PIXMAN_x14r6g6b6:
 PIXMAN_EXPORT 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,
+                                 pixman_image_t *    dest_image,
                                  int16_t             src_x,
                                  int16_t             src_y,
                                  int16_t             mask_x,
                                  int16_t             mask_y,
     pixman_region32_t r32;
     pixman_bool_t retval;
     pixman_region32_init (&r32);
-    retval = pixman_compute_composite_region32 (
+    retval = _pixman_compute_composite_region32 (
-	&r32, src_image, mask_image, dst_image,
+	&r32, src_image, mask_image, dest_image,
 	src_x, src_y, mask_x, mask_y, dest_x, dest_y,
 	width, height);

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/pixman/pixman.c – Rev 1891 → 3931