From 8ccda2be30adf9dfcc3087b38a5062258324dcce Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Fri, 21 Sep 2012 18:36:16 -0400 Subject: [PATCH] Don't auto-generate pixman-combine32.[ch] anymore Since pixman-combine64.[ch] are not used anymore, there is no point generating these files from pixman-combine.[ch].template. Also get rid of dependency on perl in configure.ac. --- .gitignore | 2 - configure.ac | 6 - pixman/Makefile.am | 3 - pixman/Makefile.sources | 5 - pixman/make-combine.pl | 86 -- ...ixman-combine.c.template => pixman-combine32.c} | 1325 ++++++++++---------- ...ixman-combine.h.template => pixman-combine32.h} | 141 ++- 7 files changed, 744 insertions(+), 824 deletions(-) delete mode 100644 pixman/make-combine.pl rename pixman/{pixman-combine.c.template => pixman-combine32.c} (53%) rename pixman/{pixman-combine.h.template => pixman-combine32.h} (53%) diff --git a/.gitignore b/.gitignore index a67da1d..2d089fc 100644 --- a/.gitignore +++ b/.gitignore @@ -39,8 +39,6 @@ demos/screen-test demos/srgb-test demos/trap-test demos/tri-test -pixman/pixman-combine32.c -pixman/pixman-combine32.h pixman/pixman-srgb.c pixman/pixman-version.h test/a1-trap-test diff --git a/configure.ac b/configure.ac index 5fda547..c069b48 100644 --- a/configure.ac +++ b/configure.ac @@ -182,12 +182,6 @@ AC_SUBST(LT_VERSION_INFO) PIXMAN_CHECK_CFLAG([-Wall]) PIXMAN_CHECK_CFLAG([-fno-strict-aliasing]) -AC_PATH_PROG(PERL, perl, no) -if test "x$PERL" = xno; then - AC_MSG_ERROR([Perl is required to build pixman.]) -fi -AC_SUBST(PERL) - dnl ========================================================================= dnl OpenMP for the test suite? dnl diff --git a/pixman/Makefile.am b/pixman/Makefile.am index 3060569..df53a69 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am @@ -12,9 +12,6 @@ noinst_LTLIBRARIES = EXTRA_DIST = \ Makefile.win32 \ - make-combine.pl \ - pixman-combine.c.template \ - pixman-combine.h.template \ pixman-region.c \ solaris-hwcap.mapfile \ $(NULL) diff --git a/pixman/Makefile.sources b/pixman/Makefile.sources index 5be288d..852a007 100644 --- a/pixman/Makefile.sources +++ b/pixman/Makefile.sources @@ -44,8 +44,3 @@ BUILT_SOURCES = \ pixman-combine32.c \ pixman-combine32.h \ $(NULL) - -pixman-combine32.c: pixman-combine.c.template make-combine.pl - $(PERL) $(lastword $+) 8 < $< > $@ || ($(RM) $@; exit 1) -pixman-combine32.h: pixman-combine.h.template make-combine.pl - $(PERL) $(lastword $+) 8 < $< > $@ || ($(RM) $@; exit 1) diff --git a/pixman/make-combine.pl b/pixman/make-combine.pl deleted file mode 100644 index 210a5da..0000000 --- a/pixman/make-combine.pl +++ /dev/null @@ -1,86 +0,0 @@ -$usage = "Usage: combine.pl { 8 | 16 } < pixman-combine.c.template"; - -$#ARGV == 0 or die $usage; - -# Get the component size. -$size = int($ARGV[0]); -$size == 8 or $size == 16 or die $usage; - -$pixel_size = $size * 4; -$half_pixel_size = $size * 2; - -sub mask { - my $str = shift; - my $suffix; - $suffix = "ULL" if $size > 8; - - return "0x" . $str . $suffix; -} - -# Generate mask strings. -$nibbles = $size / 4; -$mask = "f" x $nibbles; -$zero_mask = "0" x $nibbles; -$one_half = "8" . "0" x ($nibbles - 1); - -print "/* WARNING: This file is generated by combine.pl from combine.inc.\n"; -print " Please edit one of those files rather than this one. */\n"; -print "\n"; - -print "#line 1 \"pixman-combine.c.template\"\n"; - -$mask_ = mask($mask); -$one_half_ = mask($one_half); -$g_mask = mask($mask . $zero_mask); -$b_mask = mask($mask . $zero_mask x 2); -$a_mask = mask($mask . $zero_mask x 3); -$rb_mask = mask($mask . $zero_mask . $mask); -$ag_mask = mask($mask . $zero_mask . $mask . $zero_mask); -$rb_one_half = mask($one_half . $zero_mask . $one_half); -$rb_mask_plus_one = mask("1" . $zero_mask x 2 . "1" . $zero_mask); - -while () { - # Mask and 1/2 value for a single component. - s/#define COMPONENT_SIZE\b/$& $size/; - s/#define MASK\b/$& $mask_/; - s/#define ONE_HALF\b/$& $one_half_/; - - # Shifts and masks for green, blue, and alpha. - s/#define G_SHIFT\b/$& $size/; - s/#define R_SHIFT\b/$& $size * 2/; - s/#define A_SHIFT\b/$& $size * 3/; - s/#define G_MASK\b/$& $g_mask/; - s/#define R_MASK\b/$& $b_mask/; - s/#define A_MASK\b/$& $a_mask/; - - # Special values for dealing with red + blue at the same time. - s/#define RB_MASK\b/$& $rb_mask/; - s/#define AG_MASK\b/$& $ag_mask/; - s/#define RB_ONE_HALF\b/$& $rb_one_half/; - s/#define RB_MASK_PLUS_ONE\b/$& $rb_mask_plus_one/; - - # Add 32/64 suffix to combining function types. - s/\bCombineFunc\b/CombineFunc$pixel_size/; - s/\bFbComposeFunctions\b/FbComposeFunctions$pixel_size/; - s/combine_width/combine_$pixel_size/; - s/_pixman_setup_combiner_functions_width/_pixman_setup_combiner_functions_$pixel_size/; - s/UNc/UN$size/g; - s/ALPHA_c/ALPHA_$size/g; - s/RED_c/RED_$size/g; - s/GREEN_c/GREEN_$size/g; - s/BLUE_c/BLUE_$size/g; - - # Convert comp*_t values into the appropriate real types. - s/comp1_t/uint${size}_t/g; - s/comp2_t/uint${half_pixel_size}_t/g; - s/comp4_t/uint${pixel_size}_t/g; - - # Change the function table name for the 64-bit version. - s/pixman_composeFunctions/pixman_composeFunctions64/ if $size == 16; - - # Change the header for the 64-bit version - s/pixman-combine.h/pixman-combine64.h/ if $size == 16; - s/pixman-combine.h/pixman-combine32.h/ if $size == 8; - - print; -} diff --git a/pixman/pixman-combine.c.template b/pixman/pixman-combine32.c similarity index 53% rename from pixman/pixman-combine.c.template rename to pixman/pixman-combine32.c index f405312..54cc877 100644 --- a/pixman/pixman-combine.c.template +++ b/pixman/pixman-combine32.c @@ -1,3 +1,26 @@ +/* + * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. + * 2005 Lars Knoll & Zack Rusin, Trolltech + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ #ifdef HAVE_CONFIG_H #include #endif @@ -6,17 +29,17 @@ #include #include "pixman-private.h" -#include "pixman-combine.h" +#include "pixman-combine32.h" /* component alpha helper functions */ static void -combine_mask_ca (comp4_t *src, comp4_t *mask) +combine_mask_ca (uint32_t *src, uint32_t *mask) { - comp4_t a = *mask; + uint32_t a = *mask; - comp4_t x; - comp2_t xa; + uint32_t x; + uint16_t xa; if (!a) { @@ -35,18 +58,18 @@ combine_mask_ca (comp4_t *src, comp4_t *mask) } xa = x >> A_SHIFT; - UNcx4_MUL_UNcx4 (x, a); + UN8x4_MUL_UN8x4 (x, a); *(src) = x; - UNcx4_MUL_UNc (a, xa); + UN8x4_MUL_UN8 (a, xa); *(mask) = a; } static void -combine_mask_value_ca (comp4_t *src, const comp4_t *mask) +combine_mask_value_ca (uint32_t *src, const uint32_t *mask) { - comp4_t a = *mask; - comp4_t x; + uint32_t a = *mask; + uint32_t x; if (!a) { @@ -58,15 +81,15 @@ combine_mask_value_ca (comp4_t *src, const comp4_t *mask) return; x = *(src); - UNcx4_MUL_UNcx4 (x, a); + UN8x4_MUL_UN8x4 (x, a); *(src) = x; } static void -combine_mask_alpha_ca (const comp4_t *src, comp4_t *mask) +combine_mask_alpha_ca (const uint32_t *src, uint32_t *mask) { - comp4_t a = *(mask); - comp4_t x; + uint32_t a = *(mask); + uint32_t x; if (!a) return; @@ -83,7 +106,7 @@ combine_mask_alpha_ca (const comp4_t *src, comp4_t *mask) return; } - UNcx4_MUL_UNc (a, x); + UN8x4_MUL_UN8 (a, x); *(mask) = a; } @@ -95,10 +118,10 @@ combine_mask_alpha_ca (const comp4_t *src, comp4_t *mask) * this difference will have two versions using the same convention. */ -static force_inline comp4_t -combine_mask (const comp4_t *src, const comp4_t *mask, int i) +static force_inline uint32_t +combine_mask (const uint32_t *src, const uint32_t *mask, int i) { - comp4_t s, m; + uint32_t s, m; if (mask) { @@ -111,7 +134,7 @@ combine_mask (const comp4_t *src, const comp4_t *mask, int i) s = *(src + i); if (mask) - UNcx4_MUL_UNc (s, m); + UN8x4_MUL_UN8 (s, m); return s; } @@ -119,20 +142,20 @@ combine_mask (const comp4_t *src, const comp4_t *mask, int i) static void combine_clear (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { - memset (dest, 0, width * sizeof(comp4_t)); + memset (dest, 0, width * sizeof(uint32_t)); } static void combine_dst (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { return; @@ -141,22 +164,22 @@ combine_dst (pixman_implementation_t *imp, static void combine_src_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; if (!mask) { - memcpy (dest, src, width * sizeof (comp4_t)); + memcpy (dest, src, width * sizeof (uint32_t)); } else { for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); + uint32_t s = combine_mask (src, mask, i); *(dest + i) = s; } @@ -166,20 +189,20 @@ combine_src_u (pixman_implementation_t *imp, static void combine_over_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t ia = ALPHA_c (~s); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t ia = ALPHA_8 (~s); - UNcx4_MUL_UNc_ADD_UNcx4 (d, ia, s); + UN8x4_MUL_UN8_ADD_UN8x4 (d, ia, s); *(dest + i) = d; } } @@ -187,19 +210,19 @@ combine_over_u (pixman_implementation_t *imp, static void combine_over_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t ia = ALPHA_c (~*(dest + i)); - UNcx4_MUL_UNc_ADD_UNcx4 (s, ia, d); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t ia = ALPHA_8 (~*(dest + i)); + UN8x4_MUL_UN8_ADD_UN8x4 (s, ia, d); *(dest + i) = s; } } @@ -207,18 +230,18 @@ combine_over_reverse_u (pixman_implementation_t *imp, static void combine_in_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t a = ALPHA_c (*(dest + i)); - UNcx4_MUL_UNc (s, a); + uint32_t s = combine_mask (src, mask, i); + uint32_t a = ALPHA_8 (*(dest + i)); + UN8x4_MUL_UN8 (s, a); *(dest + i) = s; } } @@ -226,19 +249,19 @@ combine_in_u (pixman_implementation_t *imp, static void combine_in_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t a = ALPHA_c (s); - UNcx4_MUL_UNc (d, a); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t a = ALPHA_8 (s); + UN8x4_MUL_UN8 (d, a); *(dest + i) = d; } } @@ -246,18 +269,18 @@ combine_in_reverse_u (pixman_implementation_t *imp, static void combine_out_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t a = ALPHA_c (~*(dest + i)); - UNcx4_MUL_UNc (s, a); + uint32_t s = combine_mask (src, mask, i); + uint32_t a = ALPHA_8 (~*(dest + i)); + UN8x4_MUL_UN8 (s, a); *(dest + i) = s; } } @@ -265,19 +288,19 @@ combine_out_u (pixman_implementation_t *imp, static void combine_out_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t a = ALPHA_c (~s); - UNcx4_MUL_UNc (d, a); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t a = ALPHA_8 (~s); + UN8x4_MUL_UN8 (d, a); *(dest + i) = d; } } @@ -285,21 +308,21 @@ combine_out_reverse_u (pixman_implementation_t *imp, static void combine_atop_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t dest_a = ALPHA_c (d); - comp4_t src_ia = ALPHA_c (~s); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t dest_a = ALPHA_8 (d); + uint32_t src_ia = ALPHA_8 (~s); - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (s, dest_a, d, src_ia); + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (s, dest_a, d, src_ia); *(dest + i) = s; } } @@ -307,21 +330,21 @@ combine_atop_u (pixman_implementation_t *imp, static void combine_atop_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t src_a = ALPHA_c (s); - comp4_t dest_ia = ALPHA_c (~d); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t src_a = ALPHA_8 (s); + uint32_t dest_ia = ALPHA_8 (~d); - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (s, dest_ia, d, src_a); + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (s, dest_ia, d, src_a); *(dest + i) = s; } } @@ -329,21 +352,21 @@ combine_atop_reverse_u (pixman_implementation_t *imp, static void combine_xor_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t src_ia = ALPHA_c (~s); - comp4_t dest_ia = ALPHA_c (~d); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t src_ia = ALPHA_8 (~s); + uint32_t dest_ia = ALPHA_8 (~d); - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (s, dest_ia, d, src_ia); + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (s, dest_ia, d, src_ia); *(dest + i) = s; } } @@ -351,18 +374,18 @@ combine_xor_u (pixman_implementation_t *imp, static void combine_add_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - UNcx4_ADD_UNcx4 (d, s); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + UN8x4_ADD_UN8x4 (d, s); *(dest + i) = d; } } @@ -370,28 +393,28 @@ combine_add_u (pixman_implementation_t *imp, static void combine_saturate_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp2_t sa, da; + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint16_t sa, da; sa = s >> A_SHIFT; da = ~d >> A_SHIFT; if (sa > da) { - sa = DIV_UNc (da, sa); - UNcx4_MUL_UNc (s, sa); + sa = DIV_UN8 (da, sa); + UN8x4_MUL_UN8 (s, sa); } ; - UNcx4_ADD_UNcx4 (d, s); + UN8x4_ADD_UN8x4 (d, s); *(dest + i) = d; } } @@ -426,24 +449,24 @@ combine_saturate_u (pixman_implementation_t *imp, static void combine_multiply_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t ss = s; - comp4_t src_ia = ALPHA_c (~s); - comp4_t dest_ia = ALPHA_c (~d); + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t ss = s; + uint32_t src_ia = ALPHA_8 (~s); + uint32_t dest_ia = ALPHA_8 (~d); - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (ss, dest_ia, d, src_ia); - UNcx4_MUL_UNcx4 (d, s); - UNcx4_ADD_UNcx4 (d, ss); + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (ss, dest_ia, d, src_ia); + UN8x4_MUL_UN8x4 (d, s); + UN8x4_ADD_UN8x4 (d, ss); *(dest + i) = d; } @@ -452,26 +475,26 @@ combine_multiply_u (pixman_implementation_t *imp, static void combine_multiply_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t m = *(mask + i); - comp4_t s = *(src + i); - comp4_t d = *(dest + i); - comp4_t r = d; - comp4_t dest_ia = ALPHA_c (~d); + uint32_t m = *(mask + i); + uint32_t s = *(src + i); + uint32_t d = *(dest + i); + uint32_t r = d; + uint32_t dest_ia = ALPHA_8 (~d); combine_mask_ca (&s, &m); - UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc (r, ~m, s, dest_ia); - UNcx4_MUL_UNcx4 (d, s); - UNcx4_ADD_UNcx4 (r, d); + UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8 (r, ~m, s, dest_ia); + UN8x4_MUL_UN8x4 (d, s); + UN8x4_ADD_UN8x4 (r, d); *(dest + i) = r; } @@ -481,59 +504,59 @@ combine_multiply_ca (pixman_implementation_t *imp, static void \ combine_ ## name ## _u (pixman_implementation_t *imp, \ pixman_op_t op, \ - comp4_t * dest, \ - const comp4_t * src, \ - const comp4_t * mask, \ + uint32_t * dest, \ + const uint32_t * src, \ + const uint32_t * mask, \ int width) \ { \ int i; \ for (i = 0; i < width; ++i) { \ - comp4_t s = combine_mask (src, mask, i); \ - comp4_t d = *(dest + i); \ - comp1_t sa = ALPHA_c (s); \ - comp1_t isa = ~sa; \ - comp1_t da = ALPHA_c (d); \ - comp1_t ida = ~da; \ - comp4_t result; \ + uint32_t s = combine_mask (src, mask, i); \ + uint32_t d = *(dest + i); \ + uint8_t sa = ALPHA_8 (s); \ + uint8_t isa = ~sa; \ + uint8_t da = ALPHA_8 (d); \ + uint8_t ida = ~da; \ + uint32_t result; \ \ result = d; \ - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (result, isa, s, ida); \ + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (result, isa, s, ida); \ \ *(dest + i) = result + \ - (DIV_ONE_UNc (sa * (comp4_t)da) << A_SHIFT) + \ - (blend_ ## name (RED_c (d), da, RED_c (s), sa) << R_SHIFT) + \ - (blend_ ## name (GREEN_c (d), da, GREEN_c (s), sa) << G_SHIFT) + \ - (blend_ ## name (BLUE_c (d), da, BLUE_c (s), sa)); \ + (DIV_ONE_UN8 (sa * (uint32_t)da) << A_SHIFT) + \ + (blend_ ## name (RED_8 (d), da, RED_8 (s), sa) << R_SHIFT) + \ + (blend_ ## name (GREEN_8 (d), da, GREEN_8 (s), sa) << G_SHIFT) + \ + (blend_ ## name (BLUE_8 (d), da, BLUE_8 (s), sa)); \ } \ } \ \ static void \ combine_ ## name ## _ca (pixman_implementation_t *imp, \ pixman_op_t op, \ - comp4_t * dest, \ - const comp4_t * src, \ - const comp4_t * mask, \ + uint32_t * dest, \ + const uint32_t * src, \ + const uint32_t * mask, \ int width) \ { \ int i; \ for (i = 0; i < width; ++i) { \ - comp4_t m = *(mask + i); \ - comp4_t s = *(src + i); \ - comp4_t d = *(dest + i); \ - comp1_t da = ALPHA_c (d); \ - comp1_t ida = ~da; \ - comp4_t result; \ + uint32_t m = *(mask + i); \ + uint32_t s = *(src + i); \ + uint32_t d = *(dest + i); \ + uint8_t da = ALPHA_8 (d); \ + uint8_t ida = ~da; \ + uint32_t result; \ \ combine_mask_ca (&s, &m); \ \ result = d; \ - UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc (result, ~m, s, ida); \ + UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8 (result, ~m, s, ida); \ \ result += \ - (DIV_ONE_UNc (ALPHA_c (m) * (comp4_t)da) << A_SHIFT) + \ - (blend_ ## name (RED_c (d), da, RED_c (s), RED_c (m)) << R_SHIFT) + \ - (blend_ ## name (GREEN_c (d), da, GREEN_c (s), GREEN_c (m)) << G_SHIFT) + \ - (blend_ ## name (BLUE_c (d), da, BLUE_c (s), BLUE_c (m))); \ + (DIV_ONE_UN8 (ALPHA_8 (m) * (uint32_t)da) << A_SHIFT) + \ + (blend_ ## name (RED_8 (d), da, RED_8 (s), RED_8 (m)) << R_SHIFT) + \ + (blend_ ## name (GREEN_8 (d), da, GREEN_8 (s), GREEN_8 (m)) << G_SHIFT) + \ + (blend_ ## name (BLUE_8 (d), da, BLUE_8 (s), BLUE_8 (m))); \ \ *(dest + i) = result; \ } \ @@ -543,10 +566,10 @@ combine_multiply_ca (pixman_implementation_t *imp, * Screen * B(Dca, ad, Sca, as) = Dca.sa + Sca.da - Dca.Sca */ -static inline comp4_t -blend_screen (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_screen (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - return DIV_ONE_UNc (sca * da + dca * sa - sca * dca); + return DIV_ONE_UN8 (sca * da + dca * sa - sca * dca); } PDF_SEPARABLE_BLEND_MODE (screen) @@ -559,16 +582,16 @@ PDF_SEPARABLE_BLEND_MODE (screen) * otherwise * Sa.Da - 2.(Da - Dca).(Sa - Sca) */ -static inline comp4_t -blend_overlay (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_overlay (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - comp4_t rca; + uint32_t rca; if (2 * dca < da) rca = 2 * sca * dca; else rca = sa * da - 2 * (da - dca) * (sa - sca); - return DIV_ONE_UNc (rca); + return DIV_ONE_UN8 (rca); } PDF_SEPARABLE_BLEND_MODE (overlay) @@ -577,14 +600,14 @@ PDF_SEPARABLE_BLEND_MODE (overlay) * Darken * B(Dca, Da, Sca, Sa) = min (Sca.Da, Dca.Sa) */ -static inline comp4_t -blend_darken (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_darken (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - comp4_t s, d; + uint32_t s, d; s = sca * da; d = dca * sa; - return DIV_ONE_UNc (s > d ? d : s); + return DIV_ONE_UN8 (s > d ? d : s); } PDF_SEPARABLE_BLEND_MODE (darken) @@ -593,14 +616,14 @@ PDF_SEPARABLE_BLEND_MODE (darken) * Lighten * B(Dca, Da, Sca, Sa) = max (Sca.Da, Dca.Sa) */ -static inline comp4_t -blend_lighten (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_lighten (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - comp4_t s, d; + uint32_t s, d; s = sca * da; d = dca * sa; - return DIV_ONE_UNc (s > d ? s : d); + return DIV_ONE_UN8 (s > d ? s : d); } PDF_SEPARABLE_BLEND_MODE (lighten) @@ -615,17 +638,17 @@ PDF_SEPARABLE_BLEND_MODE (lighten) * otherwise * Sa.Da. min (1, Dca / Da / (1 - Sca/Sa)) */ -static inline comp4_t -blend_color_dodge (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_color_dodge (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { if (sca >= sa) { - return dca == 0 ? 0 : DIV_ONE_UNc (sa * da); + return dca == 0 ? 0 : DIV_ONE_UN8 (sa * da); } else { - comp4_t rca = dca * sa / (sa - sca); - return DIV_ONE_UNc (sa * MIN (rca, da)); + uint32_t rca = dca * sa / (sa - sca); + return DIV_ONE_UN8 (sa * MIN (rca, da)); } } @@ -641,17 +664,17 @@ PDF_SEPARABLE_BLEND_MODE (color_dodge) * otherwise * Sa.Da.(1 - min (1, (1 - Dca/Da).Sa / Sca)) */ -static inline comp4_t -blend_color_burn (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_color_burn (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { if (sca == 0) { - return dca < da ? 0 : DIV_ONE_UNc (sa * da); + return dca < da ? 0 : DIV_ONE_UN8 (sa * da); } else { - comp4_t rca = (da - dca) * sa / sca; - return DIV_ONE_UNc (sa * (MAX (rca, da) - rca)); + uint32_t rca = (da - dca) * sa / sca; + return DIV_ONE_UN8 (sa * (MAX (rca, da) - rca)); } } @@ -665,13 +688,13 @@ PDF_SEPARABLE_BLEND_MODE (color_burn) * otherwise * Sa.Da - 2.(Da - Dca).(Sa - Sca) */ -static inline comp4_t -blend_hard_light (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_hard_light (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { if (2 * sca < sa) - return DIV_ONE_UNc (2 * sca * dca); + return DIV_ONE_UN8 (2 * sca * dca); else - return DIV_ONE_UNc (sa * da - 2 * (da - dca) * (sa - sca)); + return DIV_ONE_UN8 (sa * da - 2 * (da - dca) * (sa - sca)); } PDF_SEPARABLE_BLEND_MODE (hard_light) @@ -686,11 +709,11 @@ PDF_SEPARABLE_BLEND_MODE (hard_light) * otherwise * (Dca.Sa + (SQRT (Dca/Da).Da - Dca).(2.Sca - Sa)) */ -static inline comp4_t -blend_soft_light (comp4_t dca_org, - comp4_t da_org, - comp4_t sca_org, - comp4_t sa_org) +static inline uint32_t +blend_soft_light (uint32_t dca_org, + uint32_t da_org, + uint32_t sca_org, + uint32_t sa_org) { double dca = dca_org * (1.0 / MASK); double da = da_org * (1.0 / MASK); @@ -727,16 +750,16 @@ PDF_SEPARABLE_BLEND_MODE (soft_light) * Difference * B(Dca, Da, Sca, Sa) = abs (Dca.Sa - Sca.Da) */ -static inline comp4_t -blend_difference (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_difference (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - comp4_t dcasa = dca * sa; - comp4_t scada = sca * da; + uint32_t dcasa = dca * sa; + uint32_t scada = sca * da; if (scada < dcasa) - return DIV_ONE_UNc (dcasa - scada); + return DIV_ONE_UN8 (dcasa - scada); else - return DIV_ONE_UNc (scada - dcasa); + return DIV_ONE_UN8 (scada - dcasa); } PDF_SEPARABLE_BLEND_MODE (difference) @@ -749,10 +772,10 @@ PDF_SEPARABLE_BLEND_MODE (difference) /* This can be made faster by writing it directly and not using * PDF_SEPARABLE_BLEND_MODE, but that's a performance optimization */ -static inline comp4_t -blend_exclusion (comp4_t dca, comp4_t da, comp4_t sca, comp4_t sa) +static inline uint32_t +blend_exclusion (uint32_t dca, uint32_t da, uint32_t sca, uint32_t sa) { - return DIV_ONE_UNc (sca * da + dca * sa - 2 * dca * sca); + return DIV_ONE_UN8 (sca * da + dca * sa - 2 * dca * sca); } PDF_SEPARABLE_BLEND_MODE (exclusion) @@ -876,43 +899,43 @@ PDF_SEPARABLE_BLEND_MODE (exclusion) static void \ combine_ ## name ## _u (pixman_implementation_t *imp, \ pixman_op_t op, \ - comp4_t *dest, \ - const comp4_t *src, \ - const comp4_t *mask, \ + uint32_t *dest, \ + const uint32_t *src, \ + const uint32_t *mask, \ int width) \ { \ int i; \ for (i = 0; i < width; ++i) \ { \ - comp4_t s = combine_mask (src, mask, i); \ - comp4_t d = *(dest + i); \ - comp1_t sa = ALPHA_c (s); \ - comp1_t isa = ~sa; \ - comp1_t da = ALPHA_c (d); \ - comp1_t ida = ~da; \ - comp4_t result; \ - comp4_t sc[3], dc[3], c[3]; \ + uint32_t s = combine_mask (src, mask, i); \ + uint32_t d = *(dest + i); \ + uint8_t sa = ALPHA_8 (s); \ + uint8_t isa = ~sa; \ + uint8_t da = ALPHA_8 (d); \ + uint8_t ida = ~da; \ + uint32_t result; \ + uint32_t sc[3], dc[3], c[3]; \ \ result = d; \ - UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc (result, isa, s, ida); \ - dc[0] = RED_c (d); \ - sc[0] = RED_c (s); \ - dc[1] = GREEN_c (d); \ - sc[1] = GREEN_c (s); \ - dc[2] = BLUE_c (d); \ - sc[2] = BLUE_c (s); \ + UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8 (result, isa, s, ida); \ + dc[0] = RED_8 (d); \ + sc[0] = RED_8 (s); \ + dc[1] = GREEN_8 (d); \ + sc[1] = GREEN_8 (s); \ + dc[2] = BLUE_8 (d); \ + sc[2] = BLUE_8 (s); \ blend_ ## name (c, dc, da, sc, sa); \ \ *(dest + i) = result + \ - (DIV_ONE_UNc (sa * (comp4_t)da) << A_SHIFT) + \ - (DIV_ONE_UNc (c[0]) << R_SHIFT) + \ - (DIV_ONE_UNc (c[1]) << G_SHIFT) + \ - (DIV_ONE_UNc (c[2])); \ + (DIV_ONE_UN8 (sa * (uint32_t)da) << A_SHIFT) + \ + (DIV_ONE_UN8 (c[0]) << R_SHIFT) + \ + (DIV_ONE_UN8 (c[1]) << G_SHIFT) + \ + (DIV_ONE_UN8 (c[2])); \ } \ } static void -set_lum (comp4_t dest[3], comp4_t src[3], comp4_t sa, comp4_t lum) +set_lum (uint32_t dest[3], uint32_t src[3], uint32_t sa, uint32_t lum) { double a, l, min, max; double tmp[3]; @@ -971,10 +994,10 @@ set_lum (comp4_t dest[3], comp4_t src[3], comp4_t sa, comp4_t lum) } static void -set_sat (comp4_t dest[3], comp4_t src[3], comp4_t sat) +set_sat (uint32_t dest[3], uint32_t src[3], uint32_t sat) { int id[3]; - comp4_t min, max; + uint32_t min, max; if (src[0] > src[1]) { @@ -1042,11 +1065,11 @@ set_sat (comp4_t dest[3], comp4_t src[3], comp4_t sat) * B(Cb, Cs) = set_lum (set_sat (Cs, SAT (Cb)), LUM (Cb)) */ static inline void -blend_hsl_hue (comp4_t c[3], - comp4_t dc[3], - comp4_t da, - comp4_t sc[3], - comp4_t sa) +blend_hsl_hue (uint32_t c[3], + uint32_t dc[3], + uint32_t da, + uint32_t sc[3], + uint32_t sa) { c[0] = sc[0] * da; c[1] = sc[1] * da; @@ -1062,11 +1085,11 @@ PDF_NON_SEPARABLE_BLEND_MODE (hsl_hue) * B(Cb, Cs) = set_lum (set_sat (Cb, SAT (Cs)), LUM (Cb)) */ static inline void -blend_hsl_saturation (comp4_t c[3], - comp4_t dc[3], - comp4_t da, - comp4_t sc[3], - comp4_t sa) +blend_hsl_saturation (uint32_t c[3], + uint32_t dc[3], + uint32_t da, + uint32_t sc[3], + uint32_t sa) { c[0] = dc[0] * sa; c[1] = dc[1] * sa; @@ -1082,11 +1105,11 @@ PDF_NON_SEPARABLE_BLEND_MODE (hsl_saturation) * B(Cb, Cs) = set_lum (Cs, LUM (Cb)) */ static inline void -blend_hsl_color (comp4_t c[3], - comp4_t dc[3], - comp4_t da, - comp4_t sc[3], - comp4_t sa) +blend_hsl_color (uint32_t c[3], + uint32_t dc[3], + uint32_t da, + uint32_t sc[3], + uint32_t sa) { c[0] = sc[0] * da; c[1] = sc[1] * da; @@ -1101,11 +1124,11 @@ PDF_NON_SEPARABLE_BLEND_MODE (hsl_color) * B(Cb, Cs) = set_lum (Cb, LUM (Cs)) */ static inline void -blend_hsl_luminosity (comp4_t c[3], - comp4_t dc[3], - comp4_t da, - comp4_t sc[3], - comp4_t sa) +blend_hsl_luminosity (uint32_t c[3], + uint32_t dc[3], + uint32_t da, + uint32_t sc[3], + uint32_t sa) { c[0] = dc[0] * sa; c[1] = dc[1] * sa; @@ -1162,20 +1185,20 @@ PDF_NON_SEPARABLE_BLEND_MODE (hsl_luminosity) #define COMBINE_XOR (COMBINE_A_OUT | COMBINE_B_OUT) /* portion covered by a but not b */ -static comp1_t -combine_disjoint_out_part (comp1_t a, comp1_t b) +static uint8_t +combine_disjoint_out_part (uint8_t a, uint8_t b) { /* min (1, (1-b) / a) */ b = ~b; /* 1 - b */ if (b >= a) /* 1 - b >= a -> (1-b)/a >= 1 */ return MASK; /* 1 */ - return DIV_UNc (b, a); /* (1-b) / a */ + return DIV_UN8 (b, a); /* (1-b) / a */ } /* portion covered by both a and b */ -static comp1_t -combine_disjoint_in_part (comp1_t a, comp1_t b) +static uint8_t +combine_disjoint_in_part (uint8_t a, uint8_t b) { /* max (1-(1-b)/a,0) */ /* = - min ((1-b)/a - 1, 0) */ @@ -1184,12 +1207,12 @@ combine_disjoint_in_part (comp1_t a, comp1_t b) b = ~b; /* 1 - b */ if (b >= a) /* 1 - b >= a -> (1-b)/a >= 1 */ return 0; /* 1 - 1 */ - return ~DIV_UNc(b, a); /* 1 - (1-b) / a */ + return ~DIV_UN8(b, a); /* 1 - (1-b) / a */ } /* portion covered by a but not b */ -static comp1_t -combine_conjoint_out_part (comp1_t a, comp1_t b) +static uint8_t +combine_conjoint_out_part (uint8_t a, uint8_t b) { /* max (1-b/a,0) */ /* = 1-min(b/a,1) */ @@ -1198,49 +1221,49 @@ combine_conjoint_out_part (comp1_t a, comp1_t b) if (b >= a) /* b >= a -> b/a >= 1 */ return 0x00; /* 0 */ - return ~DIV_UNc(b, a); /* 1 - b/a */ + return ~DIV_UN8(b, a); /* 1 - b/a */ } /* portion covered by both a and b */ -static comp1_t -combine_conjoint_in_part (comp1_t a, comp1_t b) +static uint8_t +combine_conjoint_in_part (uint8_t a, uint8_t b) { /* min (1,b/a) */ if (b >= a) /* b >= a -> b/a >= 1 */ return MASK; /* 1 */ - return DIV_UNc (b, a); /* b/a */ + return DIV_UN8 (b, a); /* b/a */ } -#define GET_COMP(v, i) ((comp2_t) (comp1_t) ((v) >> i)) +#define GET_COMP(v, i) ((uint16_t) (uint8_t) ((v) >> i)) #define ADD(x, y, i, t) \ ((t) = GET_COMP (x, i) + GET_COMP (y, i), \ - (comp4_t) ((comp1_t) ((t) | (0 - ((t) >> G_SHIFT)))) << (i)) + (uint32_t) ((uint8_t) ((t) | (0 - ((t) >> G_SHIFT)))) << (i)) #define GENERIC(x, y, i, ax, ay, t, u, v) \ - ((t) = (MUL_UNc (GET_COMP (y, i), ay, (u)) + \ - MUL_UNc (GET_COMP (x, i), ax, (v))), \ - (comp4_t) ((comp1_t) ((t) | \ + ((t) = (MUL_UN8 (GET_COMP (y, i), ay, (u)) + \ + MUL_UN8 (GET_COMP (x, i), ax, (v))), \ + (uint32_t) ((uint8_t) ((t) | \ (0 - ((t) >> G_SHIFT)))) << (i)) static void -combine_disjoint_general_u (comp4_t * dest, - const comp4_t *src, - const comp4_t *mask, +combine_disjoint_general_u (uint32_t * dest, + const uint32_t *src, + const uint32_t *mask, int width, - comp1_t combine) + uint8_t combine) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t m, n, o, p; - comp2_t Fa, Fb, t, u, v; - comp1_t sa = s >> A_SHIFT; - comp1_t da = d >> A_SHIFT; + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t m, n, o, p; + uint16_t Fa, Fb, t, u, v; + uint8_t sa = s >> A_SHIFT; + uint8_t da = d >> A_SHIFT; switch (combine & COMBINE_A) { @@ -1291,23 +1314,23 @@ combine_disjoint_general_u (comp4_t * dest, static void combine_disjoint_over_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp2_t a = s >> A_SHIFT; + uint32_t s = combine_mask (src, mask, i); + uint16_t a = s >> A_SHIFT; if (s != 0x00) { - comp4_t d = *(dest + i); + uint32_t d = *(dest + i); a = combine_disjoint_out_part (d >> A_SHIFT, a); - UNcx4_MUL_UNc_ADD_UNcx4 (d, a, s); + UN8x4_MUL_UN8_ADD_UN8x4 (d, a, s); *(dest + i) = d; } @@ -1317,9 +1340,9 @@ combine_disjoint_over_u (pixman_implementation_t *imp, static void combine_disjoint_in_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_A_IN); @@ -1328,9 +1351,9 @@ combine_disjoint_in_u (pixman_implementation_t *imp, static void combine_disjoint_in_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_B_IN); @@ -1339,9 +1362,9 @@ combine_disjoint_in_reverse_u (pixman_implementation_t *imp, static void combine_disjoint_out_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_A_OUT); @@ -1350,9 +1373,9 @@ combine_disjoint_out_u (pixman_implementation_t *imp, static void combine_disjoint_out_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_B_OUT); @@ -1361,9 +1384,9 @@ combine_disjoint_out_reverse_u (pixman_implementation_t *imp, static void combine_disjoint_atop_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_A_ATOP); @@ -1372,9 +1395,9 @@ combine_disjoint_atop_u (pixman_implementation_t *imp, static void combine_disjoint_atop_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_B_ATOP); @@ -1383,31 +1406,31 @@ combine_disjoint_atop_reverse_u (pixman_implementation_t *imp, static void combine_disjoint_xor_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_u (dest, src, mask, width, COMBINE_XOR); } static void -combine_conjoint_general_u (comp4_t * dest, - const comp4_t *src, - const comp4_t *mask, +combine_conjoint_general_u (uint32_t * dest, + const uint32_t *src, + const uint32_t *mask, int width, - comp1_t combine) + uint8_t combine) { int i; for (i = 0; i < width; ++i) { - comp4_t s = combine_mask (src, mask, i); - comp4_t d = *(dest + i); - comp4_t m, n, o, p; - comp2_t Fa, Fb, t, u, v; - comp1_t sa = s >> A_SHIFT; - comp1_t da = d >> A_SHIFT; + uint32_t s = combine_mask (src, mask, i); + uint32_t d = *(dest + i); + uint32_t m, n, o, p; + uint16_t Fa, Fb, t, u, v; + uint8_t sa = s >> A_SHIFT; + uint8_t da = d >> A_SHIFT; switch (combine & COMBINE_A) { @@ -1461,9 +1484,9 @@ combine_conjoint_general_u (comp4_t * dest, static void combine_conjoint_over_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_A_OVER); @@ -1472,9 +1495,9 @@ combine_conjoint_over_u (pixman_implementation_t *imp, static void combine_conjoint_over_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_B_OVER); @@ -1483,9 +1506,9 @@ combine_conjoint_over_reverse_u (pixman_implementation_t *imp, static void combine_conjoint_in_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_A_IN); @@ -1494,9 +1517,9 @@ combine_conjoint_in_u (pixman_implementation_t *imp, static void combine_conjoint_in_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_B_IN); @@ -1505,9 +1528,9 @@ combine_conjoint_in_reverse_u (pixman_implementation_t *imp, static void combine_conjoint_out_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_A_OUT); @@ -1516,9 +1539,9 @@ combine_conjoint_out_u (pixman_implementation_t *imp, static void combine_conjoint_out_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_B_OUT); @@ -1527,9 +1550,9 @@ combine_conjoint_out_reverse_u (pixman_implementation_t *imp, static void combine_conjoint_atop_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_A_ATOP); @@ -1538,9 +1561,9 @@ combine_conjoint_atop_u (pixman_implementation_t *imp, static void combine_conjoint_atop_reverse_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_B_ATOP); @@ -1549,9 +1572,9 @@ combine_conjoint_atop_reverse_u (pixman_implementation_t *imp, static void combine_conjoint_xor_u (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_u (dest, src, mask, width, COMBINE_XOR); @@ -1563,28 +1586,28 @@ combine_conjoint_xor_u (pixman_implementation_t *imp, static void combine_clear_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { - memset (dest, 0, width * sizeof(comp4_t)); + memset (dest, 0, width * sizeof(uint32_t)); } static void combine_src_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); combine_mask_value_ca (&s, &m); @@ -1595,26 +1618,26 @@ combine_src_ca (pixman_implementation_t *imp, static void combine_over_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t a; + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t a; combine_mask_ca (&s, &m); a = ~m; if (a) { - comp4_t d = *(dest + i); - UNcx4_MUL_UNcx4_ADD_UNcx4 (d, a, s); + uint32_t d = *(dest + i); + UN8x4_MUL_UN8x4_ADD_UN8x4 (d, a, s); s = d; } @@ -1625,25 +1648,25 @@ combine_over_ca (pixman_implementation_t *imp, static void combine_over_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp4_t a = ~d >> A_SHIFT; + uint32_t d = *(dest + i); + uint32_t a = ~d >> A_SHIFT; if (a) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); - UNcx4_MUL_UNcx4 (s, m); - UNcx4_MUL_UNc_ADD_UNcx4 (s, a, d); + UN8x4_MUL_UN8x4 (s, m); + UN8x4_MUL_UN8_ADD_UN8x4 (s, a, d); *(dest + i) = s; } @@ -1653,28 +1676,28 @@ combine_over_reverse_ca (pixman_implementation_t *imp, static void combine_in_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp2_t a = d >> A_SHIFT; - comp4_t s = 0; + uint32_t d = *(dest + i); + uint16_t a = d >> A_SHIFT; + uint32_t s = 0; if (a) { - comp4_t m = *(mask + i); + uint32_t m = *(mask + i); s = *(src + i); combine_mask_value_ca (&s, &m); if (a != MASK) - UNcx4_MUL_UNc (s, a); + UN8x4_MUL_UN8 (s, a); } *(dest + i) = s; @@ -1684,30 +1707,30 @@ combine_in_ca (pixman_implementation_t *imp, static void combine_in_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t a; + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t a; combine_mask_alpha_ca (&s, &m); a = m; if (a != ~0) { - comp4_t d = 0; + uint32_t d = 0; if (a) { d = *(dest + i); - UNcx4_MUL_UNcx4 (d, a); + UN8x4_MUL_UN8x4 (d, a); } *(dest + i) = d; @@ -1718,28 +1741,28 @@ combine_in_reverse_ca (pixman_implementation_t *imp, static void combine_out_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp2_t a = ~d >> A_SHIFT; - comp4_t s = 0; + uint32_t d = *(dest + i); + uint16_t a = ~d >> A_SHIFT; + uint32_t s = 0; if (a) { - comp4_t m = *(mask + i); + uint32_t m = *(mask + i); s = *(src + i); combine_mask_value_ca (&s, &m); if (a != MASK) - UNcx4_MUL_UNc (s, a); + UN8x4_MUL_UN8 (s, a); } *(dest + i) = s; @@ -1749,30 +1772,30 @@ combine_out_ca (pixman_implementation_t *imp, static void combine_out_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t a; + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t a; combine_mask_alpha_ca (&s, &m); a = ~m; if (a != ~0) { - comp4_t d = 0; + uint32_t d = 0; if (a) { d = *(dest + i); - UNcx4_MUL_UNcx4 (d, a); + UN8x4_MUL_UN8x4 (d, a); } *(dest + i) = d; @@ -1783,26 +1806,26 @@ combine_out_reverse_ca (pixman_implementation_t *imp, static void combine_atop_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t ad; - comp2_t as = d >> A_SHIFT; + uint32_t d = *(dest + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t ad; + uint16_t as = d >> A_SHIFT; combine_mask_ca (&s, &m); ad = ~m; - UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc (d, ad, s, as); + UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8 (d, ad, s, as); *(dest + i) = d; } @@ -1811,26 +1834,26 @@ combine_atop_ca (pixman_implementation_t *imp, static void combine_atop_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t ad; - comp2_t as = ~d >> A_SHIFT; + uint32_t d = *(dest + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t ad; + uint16_t as = ~d >> A_SHIFT; combine_mask_ca (&s, &m); ad = m; - UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc (d, ad, s, as); + UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8 (d, ad, s, as); *(dest + i) = d; } @@ -1839,26 +1862,26 @@ combine_atop_reverse_ca (pixman_implementation_t *imp, static void combine_xor_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t d = *(dest + i); - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t ad; - comp2_t as = ~d >> A_SHIFT; + uint32_t d = *(dest + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t ad; + uint16_t as = ~d >> A_SHIFT; combine_mask_ca (&s, &m); ad = ~m; - UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc (d, ad, s, as); + UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8 (d, ad, s, as); *(dest + i) = d; } @@ -1867,22 +1890,22 @@ combine_xor_ca (pixman_implementation_t *imp, static void combine_add_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s = *(src + i); - comp4_t m = *(mask + i); - comp4_t d = *(dest + i); + uint32_t s = *(src + i); + uint32_t m = *(mask + i); + uint32_t d = *(dest + i); combine_mask_value_ca (&s, &m); - UNcx4_ADD_UNcx4 (d, s); + UN8x4_ADD_UN8x4 (d, s); *(dest + i) = d; } @@ -1891,19 +1914,19 @@ combine_add_ca (pixman_implementation_t *imp, static void combine_saturate_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { int i; for (i = 0; i < width; ++i) { - comp4_t s, d; - comp2_t sa, sr, sg, sb, da; - comp2_t t, u, v; - comp4_t m, n, o, p; + uint32_t s, d; + uint16_t sa, sr, sg, sb, da; + uint16_t t, u, v; + uint32_t m, n, o, p; d = *(dest + i); s = *(src + i); @@ -1942,22 +1965,22 @@ combine_saturate_ca (pixman_implementation_t *imp, } static void -combine_disjoint_general_ca (comp4_t * dest, - const comp4_t *src, - const comp4_t *mask, +combine_disjoint_general_ca (uint32_t * dest, + const uint32_t *src, + const uint32_t *mask, int width, - comp1_t combine) + uint8_t combine) { int i; for (i = 0; i < width; ++i) { - comp4_t s, d; - comp4_t m, n, o, p; - comp4_t Fa, Fb; - comp2_t t, u, v; - comp4_t sa; - comp1_t da; + uint32_t s, d; + uint32_t m, n, o, p; + uint32_t Fa, Fb; + uint16_t t, u, v; + uint32_t sa; + uint8_t da; s = *(src + i); m = *(mask + i); @@ -1975,18 +1998,18 @@ combine_disjoint_general_ca (comp4_t * dest, break; case COMBINE_A_OUT: - m = (comp4_t)combine_disjoint_out_part ((comp1_t) (sa >> 0), da); - n = (comp4_t)combine_disjoint_out_part ((comp1_t) (sa >> G_SHIFT), da) << G_SHIFT; - o = (comp4_t)combine_disjoint_out_part ((comp1_t) (sa >> R_SHIFT), da) << R_SHIFT; - p = (comp4_t)combine_disjoint_out_part ((comp1_t) (sa >> A_SHIFT), da) << A_SHIFT; + m = (uint32_t)combine_disjoint_out_part ((uint8_t) (sa >> 0), da); + n = (uint32_t)combine_disjoint_out_part ((uint8_t) (sa >> G_SHIFT), da) << G_SHIFT; + o = (uint32_t)combine_disjoint_out_part ((uint8_t) (sa >> R_SHIFT), da) << R_SHIFT; + p = (uint32_t)combine_disjoint_out_part ((uint8_t) (sa >> A_SHIFT), da) << A_SHIFT; Fa = m | n | o | p; break; case COMBINE_A_IN: - m = (comp4_t)combine_disjoint_in_part ((comp1_t) (sa >> 0), da); - n = (comp4_t)combine_disjoint_in_part ((comp1_t) (sa >> G_SHIFT), da) << G_SHIFT; - o = (comp4_t)combine_disjoint_in_part ((comp1_t) (sa >> R_SHIFT), da) << R_SHIFT; - p = (comp4_t)combine_disjoint_in_part ((comp1_t) (sa >> A_SHIFT), da) << A_SHIFT; + m = (uint32_t)combine_disjoint_in_part ((uint8_t) (sa >> 0), da); + n = (uint32_t)combine_disjoint_in_part ((uint8_t) (sa >> G_SHIFT), da) << G_SHIFT; + o = (uint32_t)combine_disjoint_in_part ((uint8_t) (sa >> R_SHIFT), da) << R_SHIFT; + p = (uint32_t)combine_disjoint_in_part ((uint8_t) (sa >> A_SHIFT), da) << A_SHIFT; Fa = m | n | o | p; break; @@ -2002,18 +2025,18 @@ combine_disjoint_general_ca (comp4_t * dest, break; case COMBINE_B_OUT: - m = (comp4_t)combine_disjoint_out_part (da, (comp1_t) (sa >> 0)); - n = (comp4_t)combine_disjoint_out_part (da, (comp1_t) (sa >> G_SHIFT)) << G_SHIFT; - o = (comp4_t)combine_disjoint_out_part (da, (comp1_t) (sa >> R_SHIFT)) << R_SHIFT; - p = (comp4_t)combine_disjoint_out_part (da, (comp1_t) (sa >> A_SHIFT)) << A_SHIFT; + m = (uint32_t)combine_disjoint_out_part (da, (uint8_t) (sa >> 0)); + n = (uint32_t)combine_disjoint_out_part (da, (uint8_t) (sa >> G_SHIFT)) << G_SHIFT; + o = (uint32_t)combine_disjoint_out_part (da, (uint8_t) (sa >> R_SHIFT)) << R_SHIFT; + p = (uint32_t)combine_disjoint_out_part (da, (uint8_t) (sa >> A_SHIFT)) << A_SHIFT; Fb = m | n | o | p; break; case COMBINE_B_IN: - m = (comp4_t)combine_disjoint_in_part (da, (comp1_t) (sa >> 0)); - n = (comp4_t)combine_disjoint_in_part (da, (comp1_t) (sa >> G_SHIFT)) << G_SHIFT; - o = (comp4_t)combine_disjoint_in_part (da, (comp1_t) (sa >> R_SHIFT)) << R_SHIFT; - p = (comp4_t)combine_disjoint_in_part (da, (comp1_t) (sa >> A_SHIFT)) << A_SHIFT; + m = (uint32_t)combine_disjoint_in_part (da, (uint8_t) (sa >> 0)); + n = (uint32_t)combine_disjoint_in_part (da, (uint8_t) (sa >> G_SHIFT)) << G_SHIFT; + o = (uint32_t)combine_disjoint_in_part (da, (uint8_t) (sa >> R_SHIFT)) << R_SHIFT; + p = (uint32_t)combine_disjoint_in_part (da, (uint8_t) (sa >> A_SHIFT)) << A_SHIFT; Fb = m | n | o | p; break; @@ -2035,9 +2058,9 @@ combine_disjoint_general_ca (comp4_t * dest, static void combine_disjoint_over_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_A_OVER); @@ -2046,9 +2069,9 @@ combine_disjoint_over_ca (pixman_implementation_t *imp, static void combine_disjoint_in_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_A_IN); @@ -2057,9 +2080,9 @@ combine_disjoint_in_ca (pixman_implementation_t *imp, static void combine_disjoint_in_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_B_IN); @@ -2068,9 +2091,9 @@ combine_disjoint_in_reverse_ca (pixman_implementation_t *imp, static void combine_disjoint_out_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_A_OUT); @@ -2079,9 +2102,9 @@ combine_disjoint_out_ca (pixman_implementation_t *imp, static void combine_disjoint_out_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_B_OUT); @@ -2090,9 +2113,9 @@ combine_disjoint_out_reverse_ca (pixman_implementation_t *imp, static void combine_disjoint_atop_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_A_ATOP); @@ -2101,9 +2124,9 @@ combine_disjoint_atop_ca (pixman_implementation_t *imp, static void combine_disjoint_atop_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_B_ATOP); @@ -2112,31 +2135,31 @@ combine_disjoint_atop_reverse_ca (pixman_implementation_t *imp, static void combine_disjoint_xor_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_disjoint_general_ca (dest, src, mask, width, COMBINE_XOR); } static void -combine_conjoint_general_ca (comp4_t * dest, - const comp4_t *src, - const comp4_t *mask, +combine_conjoint_general_ca (uint32_t * dest, + const uint32_t *src, + const uint32_t *mask, int width, - comp1_t combine) + uint8_t combine) { int i; for (i = 0; i < width; ++i) { - comp4_t s, d; - comp4_t m, n, o, p; - comp4_t Fa, Fb; - comp2_t t, u, v; - comp4_t sa; - comp1_t da; + uint32_t s, d; + uint32_t m, n, o, p; + uint32_t Fa, Fb; + uint16_t t, u, v; + uint32_t sa; + uint8_t da; s = *(src + i); m = *(mask + i); @@ -2154,18 +2177,18 @@ combine_conjoint_general_ca (comp4_t * dest, break; case COMBINE_A_OUT: - m = (comp4_t)combine_conjoint_out_part ((comp1_t) (sa >> 0), da); - n = (comp4_t)combine_conjoint_out_part ((comp1_t) (sa >> G_SHIFT), da) << G_SHIFT; - o = (comp4_t)combine_conjoint_out_part ((comp1_t) (sa >> R_SHIFT), da) << R_SHIFT; - p = (comp4_t)combine_conjoint_out_part ((comp1_t) (sa >> A_SHIFT), da) << A_SHIFT; + m = (uint32_t)combine_conjoint_out_part ((uint8_t) (sa >> 0), da); + n = (uint32_t)combine_conjoint_out_part ((uint8_t) (sa >> G_SHIFT), da) << G_SHIFT; + o = (uint32_t)combine_conjoint_out_part ((uint8_t) (sa >> R_SHIFT), da) << R_SHIFT; + p = (uint32_t)combine_conjoint_out_part ((uint8_t) (sa >> A_SHIFT), da) << A_SHIFT; Fa = m | n | o | p; break; case COMBINE_A_IN: - m = (comp4_t)combine_conjoint_in_part ((comp1_t) (sa >> 0), da); - n = (comp4_t)combine_conjoint_in_part ((comp1_t) (sa >> G_SHIFT), da) << G_SHIFT; - o = (comp4_t)combine_conjoint_in_part ((comp1_t) (sa >> R_SHIFT), da) << R_SHIFT; - p = (comp4_t)combine_conjoint_in_part ((comp1_t) (sa >> A_SHIFT), da) << A_SHIFT; + m = (uint32_t)combine_conjoint_in_part ((uint8_t) (sa >> 0), da); + n = (uint32_t)combine_conjoint_in_part ((uint8_t) (sa >> G_SHIFT), da) << G_SHIFT; + o = (uint32_t)combine_conjoint_in_part ((uint8_t) (sa >> R_SHIFT), da) << R_SHIFT; + p = (uint32_t)combine_conjoint_in_part ((uint8_t) (sa >> A_SHIFT), da) << A_SHIFT; Fa = m | n | o | p; break; @@ -2181,18 +2204,18 @@ combine_conjoint_general_ca (comp4_t * dest, break; case COMBINE_B_OUT: - m = (comp4_t)combine_conjoint_out_part (da, (comp1_t) (sa >> 0)); - n = (comp4_t)combine_conjoint_out_part (da, (comp1_t) (sa >> G_SHIFT)) << G_SHIFT; - o = (comp4_t)combine_conjoint_out_part (da, (comp1_t) (sa >> R_SHIFT)) << R_SHIFT; - p = (comp4_t)combine_conjoint_out_part (da, (comp1_t) (sa >> A_SHIFT)) << A_SHIFT; + m = (uint32_t)combine_conjoint_out_part (da, (uint8_t) (sa >> 0)); + n = (uint32_t)combine_conjoint_out_part (da, (uint8_t) (sa >> G_SHIFT)) << G_SHIFT; + o = (uint32_t)combine_conjoint_out_part (da, (uint8_t) (sa >> R_SHIFT)) << R_SHIFT; + p = (uint32_t)combine_conjoint_out_part (da, (uint8_t) (sa >> A_SHIFT)) << A_SHIFT; Fb = m | n | o | p; break; case COMBINE_B_IN: - m = (comp4_t)combine_conjoint_in_part (da, (comp1_t) (sa >> 0)); - n = (comp4_t)combine_conjoint_in_part (da, (comp1_t) (sa >> G_SHIFT)) << G_SHIFT; - o = (comp4_t)combine_conjoint_in_part (da, (comp1_t) (sa >> R_SHIFT)) << R_SHIFT; - p = (comp4_t)combine_conjoint_in_part (da, (comp1_t) (sa >> A_SHIFT)) << A_SHIFT; + m = (uint32_t)combine_conjoint_in_part (da, (uint8_t) (sa >> 0)); + n = (uint32_t)combine_conjoint_in_part (da, (uint8_t) (sa >> G_SHIFT)) << G_SHIFT; + o = (uint32_t)combine_conjoint_in_part (da, (uint8_t) (sa >> R_SHIFT)) << R_SHIFT; + p = (uint32_t)combine_conjoint_in_part (da, (uint8_t) (sa >> A_SHIFT)) << A_SHIFT; Fb = m | n | o | p; break; @@ -2214,9 +2237,9 @@ combine_conjoint_general_ca (comp4_t * dest, static void combine_conjoint_over_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_A_OVER); @@ -2225,9 +2248,9 @@ combine_conjoint_over_ca (pixman_implementation_t *imp, static void combine_conjoint_over_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_B_OVER); @@ -2236,9 +2259,9 @@ combine_conjoint_over_reverse_ca (pixman_implementation_t *imp, static void combine_conjoint_in_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_A_IN); @@ -2247,9 +2270,9 @@ combine_conjoint_in_ca (pixman_implementation_t *imp, static void combine_conjoint_in_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_B_IN); @@ -2258,9 +2281,9 @@ combine_conjoint_in_reverse_ca (pixman_implementation_t *imp, static void combine_conjoint_out_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_A_OUT); @@ -2269,9 +2292,9 @@ combine_conjoint_out_ca (pixman_implementation_t *imp, static void combine_conjoint_out_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_B_OUT); @@ -2280,9 +2303,9 @@ combine_conjoint_out_reverse_ca (pixman_implementation_t *imp, static void combine_conjoint_atop_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_A_ATOP); @@ -2291,9 +2314,9 @@ combine_conjoint_atop_ca (pixman_implementation_t *imp, static void combine_conjoint_atop_reverse_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_B_ATOP); @@ -2302,136 +2325,136 @@ combine_conjoint_atop_reverse_ca (pixman_implementation_t *imp, static void combine_conjoint_xor_ca (pixman_implementation_t *imp, pixman_op_t op, - comp4_t * dest, - const comp4_t * src, - const comp4_t * mask, + uint32_t * dest, + const uint32_t * src, + const uint32_t * mask, int width) { combine_conjoint_general_ca (dest, src, mask, width, COMBINE_XOR); } void -_pixman_setup_combiner_functions_width (pixman_implementation_t *imp) +_pixman_setup_combiner_functions_32 (pixman_implementation_t *imp) { /* Unified alpha */ - imp->combine_width[PIXMAN_OP_CLEAR] = combine_clear; - imp->combine_width[PIXMAN_OP_SRC] = combine_src_u; - imp->combine_width[PIXMAN_OP_DST] = combine_dst; - imp->combine_width[PIXMAN_OP_OVER] = combine_over_u; - imp->combine_width[PIXMAN_OP_OVER_REVERSE] = combine_over_reverse_u; - imp->combine_width[PIXMAN_OP_IN] = combine_in_u; - imp->combine_width[PIXMAN_OP_IN_REVERSE] = combine_in_reverse_u; - imp->combine_width[PIXMAN_OP_OUT] = combine_out_u; - imp->combine_width[PIXMAN_OP_OUT_REVERSE] = combine_out_reverse_u; - imp->combine_width[PIXMAN_OP_ATOP] = combine_atop_u; - imp->combine_width[PIXMAN_OP_ATOP_REVERSE] = combine_atop_reverse_u; - imp->combine_width[PIXMAN_OP_XOR] = combine_xor_u; - imp->combine_width[PIXMAN_OP_ADD] = combine_add_u; - imp->combine_width[PIXMAN_OP_SATURATE] = combine_saturate_u; + imp->combine_32[PIXMAN_OP_CLEAR] = combine_clear; + imp->combine_32[PIXMAN_OP_SRC] = combine_src_u; + imp->combine_32[PIXMAN_OP_DST] = combine_dst; + imp->combine_32[PIXMAN_OP_OVER] = combine_over_u; + imp->combine_32[PIXMAN_OP_OVER_REVERSE] = combine_over_reverse_u; + imp->combine_32[PIXMAN_OP_IN] = combine_in_u; + imp->combine_32[PIXMAN_OP_IN_REVERSE] = combine_in_reverse_u; + imp->combine_32[PIXMAN_OP_OUT] = combine_out_u; + imp->combine_32[PIXMAN_OP_OUT_REVERSE] = combine_out_reverse_u; + imp->combine_32[PIXMAN_OP_ATOP] = combine_atop_u; + imp->combine_32[PIXMAN_OP_ATOP_REVERSE] = combine_atop_reverse_u; + imp->combine_32[PIXMAN_OP_XOR] = combine_xor_u; + imp->combine_32[PIXMAN_OP_ADD] = combine_add_u; + imp->combine_32[PIXMAN_OP_SATURATE] = combine_saturate_u; /* Disjoint, unified */ - imp->combine_width[PIXMAN_OP_DISJOINT_CLEAR] = combine_clear; - imp->combine_width[PIXMAN_OP_DISJOINT_SRC] = combine_src_u; - imp->combine_width[PIXMAN_OP_DISJOINT_DST] = combine_dst; - imp->combine_width[PIXMAN_OP_DISJOINT_OVER] = combine_disjoint_over_u; - imp->combine_width[PIXMAN_OP_DISJOINT_OVER_REVERSE] = combine_saturate_u; - imp->combine_width[PIXMAN_OP_DISJOINT_IN] = combine_disjoint_in_u; - imp->combine_width[PIXMAN_OP_DISJOINT_IN_REVERSE] = combine_disjoint_in_reverse_u; - imp->combine_width[PIXMAN_OP_DISJOINT_OUT] = combine_disjoint_out_u; - imp->combine_width[PIXMAN_OP_DISJOINT_OUT_REVERSE] = combine_disjoint_out_reverse_u; - imp->combine_width[PIXMAN_OP_DISJOINT_ATOP] = combine_disjoint_atop_u; - imp->combine_width[PIXMAN_OP_DISJOINT_ATOP_REVERSE] = combine_disjoint_atop_reverse_u; - imp->combine_width[PIXMAN_OP_DISJOINT_XOR] = combine_disjoint_xor_u; + imp->combine_32[PIXMAN_OP_DISJOINT_CLEAR] = combine_clear; + imp->combine_32[PIXMAN_OP_DISJOINT_SRC] = combine_src_u; + imp->combine_32[PIXMAN_OP_DISJOINT_DST] = combine_dst; + imp->combine_32[PIXMAN_OP_DISJOINT_OVER] = combine_disjoint_over_u; + imp->combine_32[PIXMAN_OP_DISJOINT_OVER_REVERSE] = combine_saturate_u; + imp->combine_32[PIXMAN_OP_DISJOINT_IN] = combine_disjoint_in_u; + imp->combine_32[PIXMAN_OP_DISJOINT_IN_REVERSE] = combine_disjoint_in_reverse_u; + imp->combine_32[PIXMAN_OP_DISJOINT_OUT] = combine_disjoint_out_u; + imp->combine_32[PIXMAN_OP_DISJOINT_OUT_REVERSE] = combine_disjoint_out_reverse_u; + imp->combine_32[PIXMAN_OP_DISJOINT_ATOP] = combine_disjoint_atop_u; + imp->combine_32[PIXMAN_OP_DISJOINT_ATOP_REVERSE] = combine_disjoint_atop_reverse_u; + imp->combine_32[PIXMAN_OP_DISJOINT_XOR] = combine_disjoint_xor_u; /* Conjoint, unified */ - imp->combine_width[PIXMAN_OP_CONJOINT_CLEAR] = combine_clear; - imp->combine_width[PIXMAN_OP_CONJOINT_SRC] = combine_src_u; - imp->combine_width[PIXMAN_OP_CONJOINT_DST] = combine_dst; - imp->combine_width[PIXMAN_OP_CONJOINT_OVER] = combine_conjoint_over_u; - imp->combine_width[PIXMAN_OP_CONJOINT_OVER_REVERSE] = combine_conjoint_over_reverse_u; - imp->combine_width[PIXMAN_OP_CONJOINT_IN] = combine_conjoint_in_u; - imp->combine_width[PIXMAN_OP_CONJOINT_IN_REVERSE] = combine_conjoint_in_reverse_u; - imp->combine_width[PIXMAN_OP_CONJOINT_OUT] = combine_conjoint_out_u; - imp->combine_width[PIXMAN_OP_CONJOINT_OUT_REVERSE] = combine_conjoint_out_reverse_u; - imp->combine_width[PIXMAN_OP_CONJOINT_ATOP] = combine_conjoint_atop_u; - imp->combine_width[PIXMAN_OP_CONJOINT_ATOP_REVERSE] = combine_conjoint_atop_reverse_u; - imp->combine_width[PIXMAN_OP_CONJOINT_XOR] = combine_conjoint_xor_u; - - imp->combine_width[PIXMAN_OP_MULTIPLY] = combine_multiply_u; - imp->combine_width[PIXMAN_OP_SCREEN] = combine_screen_u; - imp->combine_width[PIXMAN_OP_OVERLAY] = combine_overlay_u; - imp->combine_width[PIXMAN_OP_DARKEN] = combine_darken_u; - imp->combine_width[PIXMAN_OP_LIGHTEN] = combine_lighten_u; - imp->combine_width[PIXMAN_OP_COLOR_DODGE] = combine_color_dodge_u; - imp->combine_width[PIXMAN_OP_COLOR_BURN] = combine_color_burn_u; - imp->combine_width[PIXMAN_OP_HARD_LIGHT] = combine_hard_light_u; - imp->combine_width[PIXMAN_OP_SOFT_LIGHT] = combine_soft_light_u; - imp->combine_width[PIXMAN_OP_DIFFERENCE] = combine_difference_u; - imp->combine_width[PIXMAN_OP_EXCLUSION] = combine_exclusion_u; - imp->combine_width[PIXMAN_OP_HSL_HUE] = combine_hsl_hue_u; - imp->combine_width[PIXMAN_OP_HSL_SATURATION] = combine_hsl_saturation_u; - imp->combine_width[PIXMAN_OP_HSL_COLOR] = combine_hsl_color_u; - imp->combine_width[PIXMAN_OP_HSL_LUMINOSITY] = combine_hsl_luminosity_u; + imp->combine_32[PIXMAN_OP_CONJOINT_CLEAR] = combine_clear; + imp->combine_32[PIXMAN_OP_CONJOINT_SRC] = combine_src_u; + imp->combine_32[PIXMAN_OP_CONJOINT_DST] = combine_dst; + imp->combine_32[PIXMAN_OP_CONJOINT_OVER] = combine_conjoint_over_u; + imp->combine_32[PIXMAN_OP_CONJOINT_OVER_REVERSE] = combine_conjoint_over_reverse_u; + imp->combine_32[PIXMAN_OP_CONJOINT_IN] = combine_conjoint_in_u; + imp->combine_32[PIXMAN_OP_CONJOINT_IN_REVERSE] = combine_conjoint_in_reverse_u; + imp->combine_32[PIXMAN_OP_CONJOINT_OUT] = combine_conjoint_out_u; + imp->combine_32[PIXMAN_OP_CONJOINT_OUT_REVERSE] = combine_conjoint_out_reverse_u; + imp->combine_32[PIXMAN_OP_CONJOINT_ATOP] = combine_conjoint_atop_u; + imp->combine_32[PIXMAN_OP_CONJOINT_ATOP_REVERSE] = combine_conjoint_atop_reverse_u; + imp->combine_32[PIXMAN_OP_CONJOINT_XOR] = combine_conjoint_xor_u; + + imp->combine_32[PIXMAN_OP_MULTIPLY] = combine_multiply_u; + imp->combine_32[PIXMAN_OP_SCREEN] = combine_screen_u; + imp->combine_32[PIXMAN_OP_OVERLAY] = combine_overlay_u; + imp->combine_32[PIXMAN_OP_DARKEN] = combine_darken_u; + imp->combine_32[PIXMAN_OP_LIGHTEN] = combine_lighten_u; + imp->combine_32[PIXMAN_OP_COLOR_DODGE] = combine_color_dodge_u; + imp->combine_32[PIXMAN_OP_COLOR_BURN] = combine_color_burn_u; + imp->combine_32[PIXMAN_OP_HARD_LIGHT] = combine_hard_light_u; + imp->combine_32[PIXMAN_OP_SOFT_LIGHT] = combine_soft_light_u; + imp->combine_32[PIXMAN_OP_DIFFERENCE] = combine_difference_u; + imp->combine_32[PIXMAN_OP_EXCLUSION] = combine_exclusion_u; + imp->combine_32[PIXMAN_OP_HSL_HUE] = combine_hsl_hue_u; + imp->combine_32[PIXMAN_OP_HSL_SATURATION] = combine_hsl_saturation_u; + imp->combine_32[PIXMAN_OP_HSL_COLOR] = combine_hsl_color_u; + imp->combine_32[PIXMAN_OP_HSL_LUMINOSITY] = combine_hsl_luminosity_u; /* Component alpha combiners */ - imp->combine_width_ca[PIXMAN_OP_CLEAR] = combine_clear_ca; - imp->combine_width_ca[PIXMAN_OP_SRC] = combine_src_ca; + imp->combine_32_ca[PIXMAN_OP_CLEAR] = combine_clear_ca; + imp->combine_32_ca[PIXMAN_OP_SRC] = combine_src_ca; /* dest */ - imp->combine_width_ca[PIXMAN_OP_OVER] = combine_over_ca; - imp->combine_width_ca[PIXMAN_OP_OVER_REVERSE] = combine_over_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_IN] = combine_in_ca; - imp->combine_width_ca[PIXMAN_OP_IN_REVERSE] = combine_in_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_OUT] = combine_out_ca; - imp->combine_width_ca[PIXMAN_OP_OUT_REVERSE] = combine_out_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_ATOP] = combine_atop_ca; - imp->combine_width_ca[PIXMAN_OP_ATOP_REVERSE] = combine_atop_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_XOR] = combine_xor_ca; - imp->combine_width_ca[PIXMAN_OP_ADD] = combine_add_ca; - imp->combine_width_ca[PIXMAN_OP_SATURATE] = combine_saturate_ca; + imp->combine_32_ca[PIXMAN_OP_OVER] = combine_over_ca; + imp->combine_32_ca[PIXMAN_OP_OVER_REVERSE] = combine_over_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_IN] = combine_in_ca; + imp->combine_32_ca[PIXMAN_OP_IN_REVERSE] = combine_in_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_OUT] = combine_out_ca; + imp->combine_32_ca[PIXMAN_OP_OUT_REVERSE] = combine_out_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_ATOP] = combine_atop_ca; + imp->combine_32_ca[PIXMAN_OP_ATOP_REVERSE] = combine_atop_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_XOR] = combine_xor_ca; + imp->combine_32_ca[PIXMAN_OP_ADD] = combine_add_ca; + imp->combine_32_ca[PIXMAN_OP_SATURATE] = combine_saturate_ca; /* Disjoint CA */ - imp->combine_width_ca[PIXMAN_OP_DISJOINT_CLEAR] = combine_clear_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_SRC] = combine_src_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_DST] = combine_dst; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_OVER] = combine_disjoint_over_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_OVER_REVERSE] = combine_saturate_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_IN] = combine_disjoint_in_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_IN_REVERSE] = combine_disjoint_in_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_OUT] = combine_disjoint_out_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_OUT_REVERSE] = combine_disjoint_out_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_ATOP] = combine_disjoint_atop_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_ATOP_REVERSE] = combine_disjoint_atop_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_DISJOINT_XOR] = combine_disjoint_xor_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_CLEAR] = combine_clear_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_SRC] = combine_src_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_DST] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_OVER] = combine_disjoint_over_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_OVER_REVERSE] = combine_saturate_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_IN] = combine_disjoint_in_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_IN_REVERSE] = combine_disjoint_in_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_OUT] = combine_disjoint_out_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_OUT_REVERSE] = combine_disjoint_out_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_ATOP] = combine_disjoint_atop_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_ATOP_REVERSE] = combine_disjoint_atop_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_DISJOINT_XOR] = combine_disjoint_xor_ca; /* Conjoint CA */ - imp->combine_width_ca[PIXMAN_OP_CONJOINT_CLEAR] = combine_clear_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_SRC] = combine_src_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_DST] = combine_dst; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_OVER] = combine_conjoint_over_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_OVER_REVERSE] = combine_conjoint_over_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_IN] = combine_conjoint_in_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_IN_REVERSE] = combine_conjoint_in_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_OUT] = combine_conjoint_out_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_OUT_REVERSE] = combine_conjoint_out_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_ATOP] = combine_conjoint_atop_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_ATOP_REVERSE] = combine_conjoint_atop_reverse_ca; - imp->combine_width_ca[PIXMAN_OP_CONJOINT_XOR] = combine_conjoint_xor_ca; - - imp->combine_width_ca[PIXMAN_OP_MULTIPLY] = combine_multiply_ca; - imp->combine_width_ca[PIXMAN_OP_SCREEN] = combine_screen_ca; - imp->combine_width_ca[PIXMAN_OP_OVERLAY] = combine_overlay_ca; - imp->combine_width_ca[PIXMAN_OP_DARKEN] = combine_darken_ca; - imp->combine_width_ca[PIXMAN_OP_LIGHTEN] = combine_lighten_ca; - imp->combine_width_ca[PIXMAN_OP_COLOR_DODGE] = combine_color_dodge_ca; - imp->combine_width_ca[PIXMAN_OP_COLOR_BURN] = combine_color_burn_ca; - imp->combine_width_ca[PIXMAN_OP_HARD_LIGHT] = combine_hard_light_ca; - imp->combine_width_ca[PIXMAN_OP_SOFT_LIGHT] = combine_soft_light_ca; - imp->combine_width_ca[PIXMAN_OP_DIFFERENCE] = combine_difference_ca; - imp->combine_width_ca[PIXMAN_OP_EXCLUSION] = combine_exclusion_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_CLEAR] = combine_clear_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_SRC] = combine_src_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_DST] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_OVER] = combine_conjoint_over_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_OVER_REVERSE] = combine_conjoint_over_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_IN] = combine_conjoint_in_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_IN_REVERSE] = combine_conjoint_in_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_OUT] = combine_conjoint_out_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_OUT_REVERSE] = combine_conjoint_out_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_ATOP] = combine_conjoint_atop_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_ATOP_REVERSE] = combine_conjoint_atop_reverse_ca; + imp->combine_32_ca[PIXMAN_OP_CONJOINT_XOR] = combine_conjoint_xor_ca; + + imp->combine_32_ca[PIXMAN_OP_MULTIPLY] = combine_multiply_ca; + imp->combine_32_ca[PIXMAN_OP_SCREEN] = combine_screen_ca; + imp->combine_32_ca[PIXMAN_OP_OVERLAY] = combine_overlay_ca; + imp->combine_32_ca[PIXMAN_OP_DARKEN] = combine_darken_ca; + imp->combine_32_ca[PIXMAN_OP_LIGHTEN] = combine_lighten_ca; + imp->combine_32_ca[PIXMAN_OP_COLOR_DODGE] = combine_color_dodge_ca; + imp->combine_32_ca[PIXMAN_OP_COLOR_BURN] = combine_color_burn_ca; + imp->combine_32_ca[PIXMAN_OP_HARD_LIGHT] = combine_hard_light_ca; + imp->combine_32_ca[PIXMAN_OP_SOFT_LIGHT] = combine_soft_light_ca; + imp->combine_32_ca[PIXMAN_OP_DIFFERENCE] = combine_difference_ca; + imp->combine_32_ca[PIXMAN_OP_EXCLUSION] = combine_exclusion_ca; /* It is not clear that these make sense, so make them noops for now */ - imp->combine_width_ca[PIXMAN_OP_HSL_HUE] = combine_dst; - imp->combine_width_ca[PIXMAN_OP_HSL_SATURATION] = combine_dst; - imp->combine_width_ca[PIXMAN_OP_HSL_COLOR] = combine_dst; - imp->combine_width_ca[PIXMAN_OP_HSL_LUMINOSITY] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_HSL_HUE] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_HSL_SATURATION] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_HSL_COLOR] = combine_dst; + imp->combine_32_ca[PIXMAN_OP_HSL_LUMINOSITY] = combine_dst; } diff --git a/pixman/pixman-combine.h.template b/pixman/pixman-combine32.h similarity index 53% rename from pixman/pixman-combine.h.template rename to pixman/pixman-combine32.h index 20f784b..875dde3 100644 --- a/pixman/pixman-combine.h.template +++ b/pixman/pixman-combine32.h @@ -1,40 +1,39 @@ - -#define COMPONENT_SIZE -#define MASK -#define ONE_HALF - -#define A_SHIFT -#define R_SHIFT -#define G_SHIFT -#define A_MASK -#define R_MASK -#define G_MASK - -#define RB_MASK -#define AG_MASK -#define RB_ONE_HALF -#define RB_MASK_PLUS_ONE - -#define ALPHA_c(x) ((x) >> A_SHIFT) -#define RED_c(x) (((x) >> R_SHIFT) & MASK) -#define GREEN_c(x) (((x) >> G_SHIFT) & MASK) -#define BLUE_c(x) ((x) & MASK) +#define COMPONENT_SIZE 8 +#define MASK 0xff +#define ONE_HALF 0x80 + +#define A_SHIFT 8 * 3 +#define R_SHIFT 8 * 2 +#define G_SHIFT 8 +#define A_MASK 0xff000000 +#define R_MASK 0xff0000 +#define G_MASK 0xff00 + +#define RB_MASK 0xff00ff +#define AG_MASK 0xff00ff00 +#define RB_ONE_HALF 0x800080 +#define RB_MASK_PLUS_ONE 0x10000100 + +#define ALPHA_8(x) ((x) >> A_SHIFT) +#define RED_8(x) (((x) >> R_SHIFT) & MASK) +#define GREEN_8(x) (((x) >> G_SHIFT) & MASK) +#define BLUE_8(x) ((x) & MASK) /* * Helper macros. */ -#define MUL_UNc(a, b, t) \ - ((t) = (a) * (comp2_t)(b) + ONE_HALF, ((((t) >> G_SHIFT ) + (t) ) >> G_SHIFT )) +#define MUL_UN8(a, b, t) \ + ((t) = (a) * (uint16_t)(b) + ONE_HALF, ((((t) >> G_SHIFT ) + (t) ) >> G_SHIFT )) -#define DIV_UNc(a, b) \ - (((comp2_t) (a) * MASK + ((b) / 2)) / (b)) +#define DIV_UN8(a, b) \ + (((uint16_t) (a) * MASK + ((b) / 2)) / (b)) -#define ADD_UNc(x, y, t) \ +#define ADD_UN8(x, y, t) \ ((t) = (x) + (y), \ - (comp4_t) (comp1_t) ((t) | (0 - ((t) >> G_SHIFT)))) + (uint32_t) (uint8_t) ((t) | (0 - ((t) >> G_SHIFT)))) -#define DIV_ONE_UNc(x) \ +#define DIV_ONE_UN8(x) \ (((x) + ONE_HALF + (((x) + ONE_HALF) >> G_SHIFT)) >> G_SHIFT) /* @@ -45,7 +44,7 @@ /* * x_rb = (x_rb * a) / 255 */ -#define UNc_rb_MUL_UNc(x, a, t) \ +#define UN8_rb_MUL_UN8(x, a, t) \ do \ { \ t = ((x) & RB_MASK) * (a); \ @@ -57,7 +56,7 @@ /* * x_rb = min (x_rb + y_rb, 255) */ -#define UNc_rb_ADD_UNc_rb(x, y, t) \ +#define UN8_rb_ADD_UN8_rb(x, y, t) \ do \ { \ t = ((x) + (y)); \ @@ -68,7 +67,7 @@ /* * x_rb = (x_rb * a_rb) / 255 */ -#define UNc_rb_MUL_UNc_rb(x, a, t) \ +#define UN8_rb_MUL_UN8_rb(x, a, t) \ do \ { \ t = (x & MASK) * (a & MASK); \ @@ -81,16 +80,16 @@ /* * x_c = (x_c * a) / 255 */ -#define UNcx4_MUL_UNc(x, a) \ +#define UN8x4_MUL_UN8(x, a) \ do \ { \ - comp4_t r1__, r2__, t__; \ + uint32_t r1__, r2__, t__; \ \ r1__ = (x); \ - UNc_rb_MUL_UNc (r1__, (a), t__); \ + UN8_rb_MUL_UN8 (r1__, (a), t__); \ \ r2__ = (x) >> G_SHIFT; \ - UNc_rb_MUL_UNc (r2__, (a), t__); \ + UN8_rb_MUL_UN8 (r2__, (a), t__); \ \ (x) = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -98,20 +97,20 @@ /* * x_c = (x_c * a) / 255 + y_c */ -#define UNcx4_MUL_UNc_ADD_UNcx4(x, a, y) \ +#define UN8x4_MUL_UN8_ADD_UN8x4(x, a, y) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x); \ r2__ = (y) & RB_MASK; \ - UNc_rb_MUL_UNc (r1__, (a), t__); \ - UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8 (r1__, (a), t__); \ + UN8_rb_ADD_UN8_rb (r1__, r2__, t__); \ \ r2__ = (x) >> G_SHIFT; \ r3__ = ((y) >> G_SHIFT) & RB_MASK; \ - UNc_rb_MUL_UNc (r2__, (a), t__); \ - UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8 (r2__, (a), t__); \ + UN8_rb_ADD_UN8_rb (r2__, r3__, t__); \ \ (x) = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -119,22 +118,22 @@ /* * x_c = (x_c * a + y_c * b) / 255 */ -#define UNcx4_MUL_UNc_ADD_UNcx4_MUL_UNc(x, a, y, b) \ +#define UN8x4_MUL_UN8_ADD_UN8x4_MUL_UN8(x, a, y, b) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x); \ r2__ = (y); \ - UNc_rb_MUL_UNc (r1__, (a), t__); \ - UNc_rb_MUL_UNc (r2__, (b), t__); \ - UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8 (r1__, (a), t__); \ + UN8_rb_MUL_UN8 (r2__, (b), t__); \ + UN8_rb_ADD_UN8_rb (r1__, r2__, t__); \ \ r2__ = ((x) >> G_SHIFT); \ r3__ = ((y) >> G_SHIFT); \ - UNc_rb_MUL_UNc (r2__, (a), t__); \ - UNc_rb_MUL_UNc (r3__, (b), t__); \ - UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8 (r2__, (a), t__); \ + UN8_rb_MUL_UN8 (r3__, (b), t__); \ + UN8_rb_ADD_UN8_rb (r2__, r3__, t__); \ \ (x) = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -142,18 +141,18 @@ /* * x_c = (x_c * a_c) / 255 */ -#define UNcx4_MUL_UNcx4(x, a) \ +#define UN8x4_MUL_UN8x4(x, a) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x); \ r2__ = (a); \ - UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8_rb (r1__, r2__, t__); \ \ r2__ = (x) >> G_SHIFT; \ r3__ = (a) >> G_SHIFT; \ - UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8_rb (r2__, r3__, t__); \ \ (x) = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -161,22 +160,22 @@ /* * x_c = (x_c * a_c) / 255 + y_c */ -#define UNcx4_MUL_UNcx4_ADD_UNcx4(x, a, y) \ +#define UN8x4_MUL_UN8x4_ADD_UN8x4(x, a, y) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x); \ r2__ = (a); \ - UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8_rb (r1__, r2__, t__); \ r2__ = (y) & RB_MASK; \ - UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \ + UN8_rb_ADD_UN8_rb (r1__, r2__, t__); \ \ r2__ = ((x) >> G_SHIFT); \ r3__ = ((a) >> G_SHIFT); \ - UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8_rb (r2__, r3__, t__); \ r3__ = ((y) >> G_SHIFT) & RB_MASK; \ - UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \ + UN8_rb_ADD_UN8_rb (r2__, r3__, t__); \ \ (x) = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -184,24 +183,24 @@ /* * x_c = (x_c * a_c + y_c * b) / 255 */ -#define UNcx4_MUL_UNcx4_ADD_UNcx4_MUL_UNc(x, a, y, b) \ +#define UN8x4_MUL_UN8x4_ADD_UN8x4_MUL_UN8(x, a, y, b) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x); \ r2__ = (a); \ - UNc_rb_MUL_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8_rb (r1__, r2__, t__); \ r2__ = (y); \ - UNc_rb_MUL_UNc (r2__, (b), t__); \ - UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \ + UN8_rb_MUL_UN8 (r2__, (b), t__); \ + UN8_rb_ADD_UN8_rb (r1__, r2__, t__); \ \ r2__ = (x) >> G_SHIFT; \ r3__ = (a) >> G_SHIFT; \ - UNc_rb_MUL_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8_rb (r2__, r3__, t__); \ r3__ = (y) >> G_SHIFT; \ - UNc_rb_MUL_UNc (r3__, (b), t__); \ - UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \ + UN8_rb_MUL_UN8 (r3__, (b), t__); \ + UN8_rb_ADD_UN8_rb (r2__, r3__, t__); \ \ x = r1__ | (r2__ << G_SHIFT); \ } while (0) @@ -209,18 +208,18 @@ /* x_c = min(x_c + y_c, 255) */ -#define UNcx4_ADD_UNcx4(x, y) \ +#define UN8x4_ADD_UN8x4(x, y) \ do \ { \ - comp4_t r1__, r2__, r3__, t__; \ + uint32_t r1__, r2__, r3__, t__; \ \ r1__ = (x) & RB_MASK; \ r2__ = (y) & RB_MASK; \ - UNc_rb_ADD_UNc_rb (r1__, r2__, t__); \ + UN8_rb_ADD_UN8_rb (r1__, r2__, t__); \ \ r2__ = ((x) >> G_SHIFT) & RB_MASK; \ r3__ = ((y) >> G_SHIFT) & RB_MASK; \ - UNc_rb_ADD_UNc_rb (r2__, r3__, t__); \ + UN8_rb_ADD_UN8_rb (r2__, r3__, t__); \ \ x = r1__ | (r2__ << G_SHIFT); \ } while (0) -- 2.7.4