pixman: Branch 'master' - 2 commits

[Matt Turner]

 pixman/pixman-mmx.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0531170436a2a10a995c7487b396f1378affdb98
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Apr 5 17:36:05 2012 -0400

    mmx: Use force_inline instead of __inline__ (bug 46906)
    
    Fixes the build on MSVC.

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 4ac9863..3b4625c 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -319,7 +319,7 @@ in_over (__m64 src, __m64 srca, __m64 mask, __m64 dest)
 
 /* Elemental unaligned loads */
 
-static __inline__ __m64 ldq_u(uint64_t *p)
+static force_inline __m64 ldq_u(uint64_t *p)
 {
 #ifdef USE_X86_MMX
     /* x86's alignment restrictions are very relaxed. */
@@ -338,7 +338,7 @@ static __inline__ __m64 ldq_u(uint64_t *p)
 #endif
 }
 
-static __inline__ uint32_t ldl_u(const uint32_t *p)
+static force_inline uint32_t ldl_u(const uint32_t *p)
 {
 #ifdef USE_X86_MMX
     /* x86's alignment restrictions are very relaxed. */
commit b950bb12dc2baaee441b875bd81b67e48947d2f6
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Mar 15 19:16:20 2012 -0400

    mmx: enable over_n_0565 for b5g6r5
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 9d1f6af..4ac9863 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -3139,6 +3139,7 @@ static const pixman_fast_path_t mmx_fast_paths[] =
     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         ),
+    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     b5g6r5,   mmx_composite_over_n_0565         ),
     PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, null,     x8r8g8b8, mmx_composite_copy_area           ),
     PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, null,     x8b8g8r8, mmx_composite_copy_area           ),