diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-24 08:18:51 +0100 |
| commit | 6f066fc9e28c33779b89e7e48e6437965dde9b77 (patch) | |
| tree | b2b9767762bd559d1edd808820cb65a4e3330397 /pixman | |
| parent | 1b73fdf9c9aa2330380300d204fb47f512cfb6e2 (diff) | |
| parent | 5fb4fb602bde5140dcea45464e3b70a49078ad2e (diff) | |
| download | vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.gz vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.tar.bz2 vcxsrv-6f066fc9e28c33779b89e7e48e6437965dde9b77.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index 3d632e757..8fd85776d 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -63,7 +63,7 @@ _mm_empty (void) extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) _mm_mulhi_pu16 (__m64 __A, __m64 __B) { - asm("pmulhuw %1, %0\n\t" + asm ("pmulhuw %1, %0\n\t" : "+y" (__A) : "y" (__B) ); @@ -75,7 +75,7 @@ _mm_shuffle_pi16 (__m64 __A, int8_t const __N) { __m64 ret; - asm("pshufw %2, %1, %0\n\t" + asm ("pshufw %2, %1, %0\n\t" : "=y" (ret) : "y" (__A), "K" (__N) ); @@ -267,19 +267,19 @@ pix_add (__m64 a, __m64 b) static force_inline __m64 expand_alpha (__m64 pixel) { - return _mm_shuffle_pi16(pixel, _MM_SHUFFLE (3, 3, 3, 3)); + return _mm_shuffle_pi16 (pixel, _MM_SHUFFLE (3, 3, 3, 3)); } static force_inline __m64 expand_alpha_rev (__m64 pixel) { - return _mm_shuffle_pi16(pixel, _MM_SHUFFLE (0, 0, 0, 0)); + return _mm_shuffle_pi16 (pixel, _MM_SHUFFLE (0, 0, 0, 0)); } static force_inline __m64 invert_colors (__m64 pixel) { - return _mm_shuffle_pi16(pixel, _MM_SHUFFLE (3, 0, 1, 2)); + return _mm_shuffle_pi16 (pixel, _MM_SHUFFLE (3, 0, 1, 2)); } static force_inline __m64 @@ -305,14 +305,6 @@ in (__m64 src, __m64 mask) return pix_multiply (src, mask); } -static force_inline __m64 -in_over_full_src_alpha (__m64 src, __m64 mask, __m64 dest) -{ - src = _mm_or_si64 (src, MC (full_alpha)); - - return over (in (src, mask), mask, dest); -} - #ifndef _MSC_VER static force_inline __m64 in_over (__m64 src, __m64 srca, __m64 mask, __m64 dest) @@ -3049,7 +3041,6 @@ mmx_composite_copy_area (pixman_implementation_t *imp, src_x, src_y, dest_x, dest_y, width, height); } -#ifdef USE_ARM_IWMMXT static void mmx_composite_over_x888_8_8888 (pixman_implementation_t *imp, pixman_composite_info_t *info) @@ -3106,7 +3097,6 @@ mmx_composite_over_x888_8_8888 (pixman_implementation_t *imp, _mm_empty (); } -#endif static const pixman_fast_path_t mmx_fast_paths[] = { @@ -3136,15 +3126,10 @@ static const pixman_fast_path_t mmx_fast_paths[] = PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, mmx_composite_over_8888_n_8888 ), PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, a8b8g8r8, mmx_composite_over_8888_n_8888 ), PIXMAN_STD_FAST_PATH (OVER, a8b8g8r8, solid, x8b8g8r8, mmx_composite_over_8888_n_8888 ), -#ifdef USE_ARM_IWMMXT - /* FIXME: This code is commented out since it's apparently - * not actually faster than the generic code on x86. - */ PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, x8r8g8b8, mmx_composite_over_x888_8_8888 ), PIXMAN_STD_FAST_PATH (OVER, x8r8g8b8, a8, a8r8g8b8, mmx_composite_over_x888_8_8888 ), PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, x8b8g8r8, mmx_composite_over_x888_8_8888 ), PIXMAN_STD_FAST_PATH (OVER, x8b8g8r8, a8, a8b8g8r8, mmx_composite_over_x888_8_8888 ), -#endif PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, mmx_composite_over_n_8888 ), PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, mmx_composite_over_n_8888 ), PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, mmx_composite_over_n_0565 ), |