A few other renamings of SSE->SSE2

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 36e82b7..a856fe4 100644 (file)
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -36,9 +36,6 @@
 #ifdef USE_MMX
 
 #include <mmintrin.h>
-#ifdef USE_SSE
-#include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */
-#endif
 
 #include "pixman-mmx.h"
 

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index b918219..200a2da 100644 (file)
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1395,7 +1395,7 @@ static const FastPathInfo mmx_fast_paths[] =
 #endif
 
 #ifdef USE_SSE2
-static const FastPathInfo sse_fast_paths[] =
+static const FastPathInfo sse2_fast_paths[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_r5g6b5,   fbCompositeSolidMask_nx8x0565sse2,     0 },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_b5g6r5,   fbCompositeSolidMask_nx8x0565sse2,     0 },
@@ -1755,7 +1755,7 @@ pixman_image_composite (pixman_op_t      op,
 #endif
 
 #ifdef USE_SSE2
-    fbComposeSetupSSE();
+    fbComposeSetupSSE2();
 #endif
 
     if (srcRepeat && srcTransform &&
@@ -1815,8 +1815,8 @@ pixman_image_composite (pixman_op_t      op,
        info = NULL;
        
 #ifdef USE_SSE2
-       if (pixman_have_sse ())
-           info = get_fast_path (sse_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+       if (pixman_have_sse2 ())
+           info = get_fast_path (sse2_fast_paths, op, pSrc, pMask, pDst, pixbuf);
 #endif
 
 #ifdef USE_MMX
@@ -2149,19 +2149,19 @@ pixman_have_mmx (void)
 
 #ifdef USE_SSE2
 pixman_bool_t
-pixman_have_sse (void)
+pixman_have_sse2 (void)
 {
     static pixman_bool_t initialized = FALSE;
-    static pixman_bool_t sse_present;
+    static pixman_bool_t sse2_present;
 
     if (!initialized)
     {
         unsigned int features = detectCPUFeatures();
-        sse_present = (features & (MMX|MMX_Extensions|SSE|SSE2)) == (MMX|MMX_Extensions|SSE|SSE2);
+        sse2_present = (features & (MMX|MMX_Extensions|SSE|SSE2)) == (MMX|MMX_Extensions|SSE|SSE2);
         initialized = TRUE;
     }
 
-    return sse_present;
+    return sse2_present;
 }
 #endif
 

diff --git a/pixman/pixman-sse.h b/pixman/pixman-sse.h
index acec621..2bcbf97 100644 (file)
--- a/pixman/pixman-sse.h
+++ b/pixman/pixman-sse.h
@@ -38,18 +38,18 @@
 #ifdef USE_SSE2
 
 #if !defined(__amd64__) && !defined(__x86_64__)
-pixman_bool_t pixman_have_sse(void);
+pixman_bool_t pixman_have_sse2(void);
 #else
-#define pixman_have_sse() TRUE
+#define pixman_have_sse2() TRUE
 #endif
 
 #else
-#define pixman_have_sse() FALSE
+#define pixman_have_sse2() FALSE
 #endif
 
 #ifdef USE_SSE2
 
-void fbComposeSetupSSE(void);
+void fbComposeSetupSSE2(void);
 
 pixman_bool_t
 pixmanFillsse2 (uint32_t *bits,

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index f268a52..8a78713 100644 (file)
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -2087,7 +2087,7 @@ coreCombineAddCsse2 (uint32_t *pd, uint32_t *ps, uint32_t *pm, int w)
 }
 
 /* -------------------------------------------------------------------------------------------------
- * fbComposeSetupSSE
+ * fbComposeSetupSSE2
  */
 static inline __m64
 createMask_16_64 (uint16_t mask)
@@ -2277,7 +2277,7 @@ sse2CombineAddC (uint32_t *dst, uint32_t *src, uint32_t *mask, int width)
 }
 
 void
-fbComposeSetupSSE(void)
+fbComposeSetupSSE2(void)
 {
     static pixman_bool_t initialized = FALSE;
 
@@ -2285,7 +2285,7 @@ fbComposeSetupSSE(void)
        return;
     
     /* check if we have SSE2 support and initialize accordingly */
-    if (pixman_have_sse())
+    if (pixman_have_sse2())
     {
         /* SSE2 constants */
         Mask565r  = createMask_2x32_128 (0x00f80000, 0x00f80000);