summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2011-06-27 21:17:04 (GMT)
committerTaekyun Kim <tkq.kim@samsung.com>2011-10-10 03:18:21 (GMT)
commitfc62785aabbe890b656c9cbaa57f2e65e74bbcc2 (patch)
treeec6d514159e245d1400a3884c88e3f047ba3a787
parentfa6523d13ae9b7986bb890df5ad66e8599bc3ed8 (diff)
downloadpixman-fc62785aabbe890b656c9cbaa57f2e65e74bbcc2.tar.gz
pixman-fc62785aabbe890b656c9cbaa57f2e65e74bbcc2.tar.xz
Add src, mask, and dest flags to the composite args struct.
These flags are useful in the various compositing routines, and the flags stored in the image structs are missing some bits of information that can only be computed when pixman_image_composite() is called.
-rw-r--r--pixman/pixman-private.h4
-rw-r--r--pixman/pixman.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 741fa7e..c315220 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -373,6 +373,10 @@ typedef struct
int32_t dest_y;
int32_t width;
int32_t height;
+
+ uint32_t src_flags;
+ uint32_t mask_flags;
+ uint32_t dest_flags;
} pixman_composite_info_t;
#define PIXMAN_COMPOSITE_ARGS(info) \
diff --git a/pixman/pixman.c b/pixman/pixman.c
index 87f5a93..8ff78e9 100644
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -804,6 +804,9 @@ pixman_image_composite32 (pixman_op_t op,
info.src_image = src;
info.mask_image = mask;
info.dest_image = dest;
+ info.src_flags = src_flags;
+ info.mask_flags = mask_flags;
+ info.dest_flags = dest_flags;
pbox = pixman_region32_rectangles (&region, &n);