From: Chris Wilson Date: Sun, 13 Sep 2009 15:32:27 +0000 (+0100) Subject: Merge branch '0.16' X-Git-Tag: pixman-0.17.2~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56cc06f89b7db733e5036a00df7aea27cf8d0951;p=platform%2Fupstream%2Fpixman.git Merge branch '0.16' Conflicts: configure.ac pixman/pixman-sse2.c --- 56cc06f89b7db733e5036a00df7aea27cf8d0951 diff --cc pixman/pixman-sse2.c index e9cdf9e,bb74882..9104e8d --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@@ -5595,7 -5604,10 +5595,7 @@@ static const pixman_fast_path_t sse2_fa { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, sse2_composite_over_x888_8_8888, 0 }, { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, sse2_composite_over_x888_8_8888, 0 }, { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_x8b8g8r8, sse2_composite_over_x888_8_8888, 0 }, - { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_a8r8g8b8, sse2_composite_over_x888_8_8888, 0 }, + { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_a8b8g8r8, sse2_composite_over_x888_8_8888, 0 }, -#endif { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, sse2_composite_over_x888_n_8888, NEED_SOLID_MASK }, { PIXMAN_OP_OVER, PIXMAN_x8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, sse2_composite_over_x888_n_8888, NEED_SOLID_MASK }, { PIXMAN_OP_OVER, PIXMAN_x8b8g8r8, PIXMAN_a8, PIXMAN_a8b8g8r8, sse2_composite_over_x888_n_8888, NEED_SOLID_MASK },