diff options
Diffstat (limited to 'pixman/pixman/pixman-combine64.c')
| -rw-r--r-- | pixman/pixman/pixman-combine64.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pixman/pixman/pixman-combine64.c b/pixman/pixman/pixman-combine64.c index 5c9803319..03e271b95 100644 --- a/pixman/pixman/pixman-combine64.c +++ b/pixman/pixman/pixman-combine64.c @@ -82,7 +82,6 @@ combine_mask_alpha_ca (const uint64_t *src, uint64_t *mask) if (a == ~0) { - x = x >> A_SHIFT; x |= x << G_SHIFT; x |= x << R_SHIFT; *(mask) = x; @@ -1614,17 +1613,14 @@ combine_over_ca (pixman_implementation_t *imp, combine_mask_ca (&s, &m); a = ~m; - if (a != ~0) + if (a) { - if (a) - { - uint64_t d = *(dest + i); - UN16x4_MUL_UN16x4_ADD_UN16x4 (d, a, s); - s = d; - } - - *(dest + i) = s; + uint64_t d = *(dest + i); + UN16x4_MUL_UN16x4_ADD_UN16x4 (d, a, s); + s = d; } + + *(dest + i) = s; } } @@ -1648,10 +1644,8 @@ combine_over_reverse_ca (pixman_implementation_t *imp, uint64_t s = *(src + i); uint64_t m = *(mask + i); - combine_mask_value_ca (&s, &m); - - if (a != MASK) - UN16x4_MUL_UN16_ADD_UN16x4 (s, a, d); + UN16x4_MUL_UN16x4 (s, m); + UN16x4_MUL_UN16_ADD_UN16x4 (s, a, d); *(dest + i) = s; } |