From: Søren Sandmann Pedersen <ssp@hp-sandybridge.(none)> --- pixman/pixman-mmx.c | 2 +- pixman/pixman-sse2.c | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index 62a73d6..0185df6 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -2660,7 +2660,7 @@ mmx_composite_in_n_8_8 (pixman_implementation_t *imp, vmask = load8888 (*(uint32_t *)mask); vdest = load8888 (*(uint32_t *)dst); - + *(uint32_t *)dst = store8888 (in (in (vsrca, vmask), vdest)); dst += 4; diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index 533b858..1fd66bf 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -2537,20 +2537,19 @@ sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp, int32_t width, int32_t height) { - uint32_t src, srca; + uint32_t src; uint32_t *dst_line, d; uint32_t *mask_line, m; uint32_t pack_cmp; int dst_stride, mask_stride; - __m128i xmm_src, xmm_alpha; + __m128i xmm_src; __m128i xmm_dst; __m128i xmm_mask, xmm_mask_lo, xmm_mask_hi; - __m128i mmx_src, mmx_alpha, mmx_mask, mmx_dest; + __m128i mmx_src, mmx_mask, mmx_dest; src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format); - srca = src >> 24; if (src == 0) return; @@ -2562,9 +2561,7 @@ sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp, xmm_src = _mm_unpacklo_epi8 ( create_mask_2x32_128 (src, src), _mm_setzero_si128 ()); - xmm_alpha = expand_alpha_1x128 (xmm_src); mmx_src = xmm_src; - mmx_alpha = xmm_alpha; while (height--) { @@ -3628,7 +3625,7 @@ sse2_composite_over_n_8_0565 (pixman_implementation_t *imp, int32_t width, int32_t height) { - uint32_t src, srca; + uint32_t src; uint16_t *dst_line, *dst, d; uint8_t *mask_line, *mask; int dst_stride, mask_stride; @@ -3642,7 +3639,6 @@ sse2_composite_over_n_8_0565 (pixman_implementation_t *imp, src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format); - srca = src >> 24; if (src == 0) return; @@ -4143,7 +4139,6 @@ sse2_composite_in_n_8_8 (pixman_implementation_t *imp, int dst_stride, mask_stride; uint32_t d, m; uint32_t src; - uint8_t sa; int32_t w; __m128i xmm_alpha; @@ -4157,8 +4152,6 @@ sse2_composite_in_n_8_8 (pixman_implementation_t *imp, src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format); - sa = src >> 24; - xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src)); while (height--) @@ -4415,7 +4408,6 @@ sse2_composite_add_n_8_8 (pixman_implementation_t *imp, int dst_stride, mask_stride; int32_t w; uint32_t src; - uint8_t sa; uint32_t m, d; __m128i xmm_alpha; @@ -4429,8 +4421,6 @@ sse2_composite_add_n_8_8 (pixman_implementation_t *imp, src = _pixman_image_get_solid (imp, src_image, dst_image->bits.format); - sa = src >> 24; - xmm_alpha = expand_alpha_1x128 (expand_pixel_32_1x128 (src)); while (height--) -- 1.7.4 _______________________________________________ Pixman mailing list Pixman@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/pixman