projects / platform / upstream / pixman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 105d398)
Rename fbHaveMMX() pixman_have_mmx()
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Mon, 11 Jun 2007 18:54:44 +0000 (14:54 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Mon, 11 Jun 2007 18:54:44 +0000 (14:54 -0400)
Guard pixman_blt_mmx() with pixman_have_mmx()

pixman/pixman-mmx.h patch | blob | history
pixman/pixman-pict.c patch | blob | history
pixman/pixman-utils.c patch | blob | history

diff --git a/pixman/pixman-mmx.h b/pixman/pixman-mmx.h
index fd888f3..9ea2ad7 100644 (file)
--- a/pixman/pixman-mmx.h
+++ b/pixman/pixman-mmx.h
@@ -35,13 +35,13 @@
 #ifdef USE_MMX
 
 #if !defined(__amd64__) && !defined(__x86_64__)
-pixman_bool_t fbHaveMMX(void);
+pixman_bool_t pixman_have_mmx(void);
 #else
-#define fbHaveMMX() TRUE
+#define pixman_have_mmx() TRUE
 #endif
 
 #else
-#define fbHaveMMX() FALSE
+#define pixman_have_mmx() FALSE
 #endif
 
 #ifdef USE_MMX
diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 96431a3..5d5417c 100644 (file)
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1137,7 +1137,7 @@ pixman_image_composite (pixman_op_t      op,
                        case PIXMAN_r5g6b5:
                        case PIXMAN_b5g6r5:
 #ifdef USE_MMX
-                           if (fbHaveMMX())
+                           if (pixman_have_mmx())
                                func = fbCompositeSolidMask_nx8x0565mmx;
                            else
 #endif
@@ -1152,7 +1152,7 @@ pixman_image_composite (pixman_op_t      op,
                        case PIXMAN_a8b8g8r8:
                        case PIXMAN_x8b8g8r8:
 #ifdef USE_MMX
-                           if (fbHaveMMX())
+                           if (pixman_have_mmx())
                                func = fbCompositeSolidMask_nx8x8888mmx;
                            else
 #endif
@@ -1168,7 +1168,7 @@ pixman_image_composite (pixman_op_t      op,
                            case PIXMAN_a8r8g8b8:
                            case PIXMAN_x8r8g8b8:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSolidMask_nx8888x8888Cmmx;
                                else
 #endif
@@ -1176,7 +1176,7 @@ pixman_image_composite (pixman_op_t      op,
                                break;
                            case PIXMAN_r5g6b5:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSolidMask_nx8888x0565Cmmx;
                                else
 #endif
@@ -1193,7 +1193,7 @@ pixman_image_composite (pixman_op_t      op,
                            case PIXMAN_a8b8g8r8:
                            case PIXMAN_x8b8g8r8:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSolidMask_nx8888x8888Cmmx;
                                else
 #endif
@@ -1201,7 +1201,7 @@ pixman_image_composite (pixman_op_t      op,
                                break;
                            case PIXMAN_b5g6r5:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSolidMask_nx8888x0565Cmmx;
                                else
 #endif
@@ -1261,13 +1261,13 @@ pixman_image_composite (pixman_op_t      op,
                            case PIXMAN_a8r8g8b8:
                            case PIXMAN_x8r8g8b8:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSrc_8888RevNPx8888mmx;
 #endif
                                break;
                            case PIXMAN_r5g6b5:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSrc_8888RevNPx0565mmx;
 #endif
                                break;
@@ -1287,13 +1287,13 @@ pixman_image_composite (pixman_op_t      op,
                            case PIXMAN_a8b8g8r8:
                            case PIXMAN_x8b8g8r8:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSrc_8888RevNPx8888mmx;
 #endif
                                break;
                            case PIXMAN_r5g6b5:
 #ifdef USE_MMX
-                               if (fbHaveMMX())
+                               if (pixman_have_mmx())
                                    func = fbCompositeSrc_8888RevNPx0565mmx;
 #endif
                                break;
@@ -1319,25 +1319,25 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_x8r8g8b8:
                        if ((pDst->bits.format == PIXMAN_a8r8g8b8 ||
                             pDst->bits.format == PIXMAN_x8r8g8b8) &&
-                           pMask->bits.format == PIXMAN_a8 && fbHaveMMX())
+                           pMask->bits.format == PIXMAN_a8 && pixman_have_mmx())
                            func = fbCompositeSrc_x888x8x8888mmx;
                        break;
                    case PIXMAN_x8b8g8r8:
                        if ((pDst->bits.format == PIXMAN_a8b8g8r8 ||
                             pDst->bits.format == PIXMAN_x8b8g8r8) &&
-                           pMask->bits.format == PIXMAN_a8 && fbHaveMMX())
+                           pMask->bits.format == PIXMAN_a8 && pixman_have_mmx())
                            func = fbCompositeSrc_x888x8x8888mmx;
                        break;
                    case PIXMAN_a8r8g8b8:
                        if ((pDst->bits.format == PIXMAN_a8r8g8b8 ||
                             pDst->bits.format == PIXMAN_x8r8g8b8) &&
-                           pMask->bits.format == PIXMAN_a8 && fbHaveMMX())
+                           pMask->bits.format == PIXMAN_a8 && pixman_have_mmx())
                            func = fbCompositeSrc_8888x8x8888mmx;
                        break;
                    case PIXMAN_a8b8g8r8:
                        if ((pDst->bits.format == PIXMAN_a8b8g8r8 ||
                             pDst->bits.format == PIXMAN_x8b8g8r8) &&
-                           pMask->bits.format == PIXMAN_a8 && fbHaveMMX())
+                           pMask->bits.format == PIXMAN_a8 && pixman_have_mmx())
                            func = fbCompositeSrc_8888x8x8888mmx;
                        break;
 #endif
@@ -1361,7 +1361,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_a8r8g8b8:
                    case PIXMAN_x8r8g8b8:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                        {
                            srcRepeat = FALSE;
                            func = fbCompositeSolid_nx8888mmx;
@@ -1370,7 +1370,7 @@ pixman_image_composite (pixman_op_t      op,
                        break;
                    case PIXMAN_r5g6b5:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                        {
                            srcRepeat = FALSE;
                            func = fbCompositeSolid_nx0565mmx;
@@ -1393,7 +1393,7 @@ pixman_image_composite (pixman_op_t      op,
                if (pSrc->bits.format == pDst->bits.format && !PIXMAN_FORMAT_A(pSrc->bits.format))
                {
 #ifdef USE_MMX
-                   if (fbHaveMMX() &&
+                   if (pixman_have_mmx() &&
                        (pSrc->bits.format == PIXMAN_x8r8g8b8 || pSrc->bits.format == PIXMAN_x8b8g8r8))
                        func = fbCompositeCopyAreammx;
                    else
@@ -1410,7 +1410,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_a8r8g8b8:
                    case PIXMAN_x8r8g8b8:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeSrc_8888x8888mmx;
                        else
 #endif
@@ -1421,7 +1421,7 @@ pixman_image_composite (pixman_op_t      op,
                        break;
                    case PIXMAN_r5g6b5:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeSrc_8888x0565mmx;
                        else
 #endif
@@ -1436,7 +1436,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_a8r8g8b8:
                    case PIXMAN_x8r8g8b8:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeCopyAreammx;
 #endif
                        break;
@@ -1448,7 +1448,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_a8b8g8r8:
                    case PIXMAN_x8b8g8r8:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeCopyAreammx;
 #endif
                        break;
@@ -1461,7 +1461,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_a8b8g8r8:
                    case PIXMAN_x8b8g8r8:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeSrc_8888x8888mmx;
                        else
 #endif
@@ -1472,7 +1472,7 @@ pixman_image_composite (pixman_op_t      op,
                        break;
                    case PIXMAN_b5g6r5:
 #ifdef USE_MMX
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                            func = fbCompositeSrc_8888x0565mmx;
                        else
 #endif
@@ -1496,7 +1496,7 @@ pixman_image_composite (pixman_op_t      op,
                switch (pDst->bits.format) {
                case PIXMAN_a8r8g8b8:
 #ifdef USE_MMX
-                   if (fbHaveMMX())
+                   if (pixman_have_mmx())
                        func = fbCompositeSrcAdd_8888x8888mmx;
                    else
 #endif
@@ -1510,7 +1510,7 @@ pixman_image_composite (pixman_op_t      op,
                switch (pDst->bits.format) {
                case PIXMAN_a8b8g8r8:
 #ifdef USE_MMX
-                   if (fbHaveMMX())
+                   if (pixman_have_mmx())
                        func = fbCompositeSrcAdd_8888x8888mmx;
                    else
 #endif
@@ -1524,7 +1524,7 @@ pixman_image_composite (pixman_op_t      op,
                switch (pDst->bits.format) {
                case PIXMAN_a8:
 #ifdef USE_MMX
-                   if (fbHaveMMX())
+                   if (pixman_have_mmx())
                        func = fbCompositeSrcAdd_8000x8000mmx;
                    else
 #endif
@@ -1560,7 +1560,7 @@ pixman_image_composite (pixman_op_t      op,
            {
                srcRepeat = FALSE;
 #ifdef USE_MMX
-               if (fbHaveMMX())
+               if (pixman_have_mmx())
                    func = fbCompositeSrcAdd_8888x8x8mmx;
                else
 #endif
@@ -1582,7 +1582,7 @@ pixman_image_composite (pixman_op_t      op,
                    case PIXMAN_x8r8g8b8:
                    case PIXMAN_a8b8g8r8:
                    case PIXMAN_x8b8g8r8:
-                       if (fbHaveMMX())
+                       if (pixman_have_mmx())
                        {
                            srcRepeat = FALSE;
                            func = fbCompositeSolidMaskSrc_nx8x8888mmx;
@@ -1600,7 +1600,7 @@ pixman_image_composite (pixman_op_t      op,
            if (pSrc->bits.format == pDst->bits.format)
            {
 #ifdef USE_MMX
-               if (pSrc->bits.bits != pDst->bits.bits && fbHaveMMX() &&
+               if (pSrc->bits.bits != pDst->bits.bits && pixman_have_mmx() &&
                    (PIXMAN_FORMAT_BPP (pSrc->bits.format) == 16 ||
                     PIXMAN_FORMAT_BPP (pSrc->bits.format) == 32))
                    func = fbCompositeCopyAreammx;
@@ -1620,7 +1620,7 @@ pixman_image_composite (pixman_op_t      op,
            pDst->bits.format == PIXMAN_a8 &&
            !pMask)
        {
-           if (fbHaveMMX())
+           if (pixman_have_mmx())
                func = fbCompositeIn_8x8mmx;
        }
        else if (srcRepeat && pMask && !pMask->common.component_alpha &&
@@ -1629,7 +1629,7 @@ pixman_image_composite (pixman_op_t      op,
                 (pMask->bits.format == PIXMAN_a8)        &&
                 pDst->bits.format == PIXMAN_a8)
        {
-           if (fbHaveMMX())
+           if (pixman_have_mmx())
            {
                srcRepeat = FALSE;
                func = fbCompositeIn_nx8x8mmx;
@@ -1842,7 +1842,7 @@ static unsigned int detectCPUFeatures(void) {
 }
 
 pixman_bool_t
-fbHaveMMX (void)
+pixman_have_mmx (void)
 {
     static pixman_bool_t initialized = FALSE;
     static pixman_bool_t mmx_present;
diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index dad82f8..ab6a1cd 100644 (file)
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -69,9 +69,12 @@ pixman_blt (uint32_t *src_bits,
            int width, int height)
 {
 #ifdef USE_MMX
-    return pixman_blt_mmx (src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
-                          src_x, src_y, dst_x, dst_y, width, height);
-#else
-    return FALSE;
+    if (pixman_have_mmx())
+    {
+       return pixman_blt_mmx (src_bits, dst_bits, src_stride, dst_stride, src_bpp, dst_bpp,
+                              src_x, src_y, dst_x, dst_y, width, height);
+    }
+    else
 #endif
+       return FALSE;
 }
Domain: Graphics System / Rendering Engine;