projects / platform / upstream / pixman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f1a212)
Make SSE2 fast paths static and remove them from the header file
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Wed, 13 May 2009 09:53:40 +0000 (05:53 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Sat, 16 May 2009 19:14:36 +0000 (15:14 -0400)
pixman/pixman-sse2.c patch | blob | history
pixman/pixman-sse2.h patch | blob | history

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 240d079..af458dc 100644 (file)
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -2537,7 +2537,7 @@ fbComposeSetupSSE2(void)
  * fbCompositeSolid_nx8888
  */
 
-void
+static void
 fbCompositeSolid_nx8888sse2 (pixman_op_t op,
                            pixman_image_t * pSrc,
                            pixman_image_t * pMask,
@@ -2623,7 +2623,7 @@ fbCompositeSolid_nx8888sse2 (pixman_op_t op,
 /* -------------------------------------------------------------------------------------------------
  * fbCompositeSolid_nx0565
  */
-void
+static void
 fbCompositeSolid_nx0565sse2 (pixman_op_t op,
                            pixman_image_t * pSrc,
                            pixman_image_t * pMask,
@@ -2712,7 +2712,7 @@ fbCompositeSolid_nx0565sse2 (pixman_op_t op,
  * fbCompositeSolidMask_nx8888x8888C
  */
 
-void
+static void
 fbCompositeSolidMask_nx8888x8888Csse2 (pixman_op_t op,
                                      pixman_image_t * pSrc,
                                      pixman_image_t * pMask,
@@ -2846,7 +2846,7 @@ fbCompositeSolidMask_nx8888x8888Csse2 (pixman_op_t op,
  * fbCompositeSrc_8888x8x8888
  */
 
-void
+static void
 fbCompositeSrc_8888x8x8888sse2 (pixman_op_t op,
                               pixman_image_t * pSrc,
                               pixman_image_t * pMask,
@@ -2958,7 +2958,7 @@ fbCompositeSrc_8888x8x8888sse2 (pixman_op_t op,
 /* -------------------------------------------------------------------------------------------------
  * fbCompositeSrc_x888xnx8888
  */
-void
+static void
 fbCompositeSrc_x888xnx8888sse2 (pixman_op_t op,
                               pixman_image_t * pSrc,
                               pixman_image_t * pMask,
@@ -3070,7 +3070,7 @@ fbCompositeSrc_x888xnx8888sse2 (pixman_op_t op,
 /* -------------------------------------------------------------------------------------------------
  * fbCompositeSrc_8888x8888
  */
-void
+static void
 fbCompositeSrc_8888x8888sse2 (pixman_op_t op,
                             pixman_image_t * pSrc,
                             pixman_image_t * pMask,
@@ -3118,7 +3118,7 @@ fbCompositeSrc_8888x0565pixel (uint32_t src, uint16_t dst)
                                                    expand565_16_1x64 (dst))));
 }
 
-void
+static void
 fbCompositeSrc_8888x0565sse2 (pixman_op_t op,
                             pixman_image_t * pSrc,
                             pixman_image_t * pMask,
@@ -3231,7 +3231,7 @@ fbCompositeSrc_8888x0565sse2 (pixman_op_t op,
  * fbCompositeSolidMask_nx8x8888
  */
 
-void
+static void
 fbCompositeSolidMask_nx8x8888sse2 (pixman_op_t op,
                                  pixman_image_t * pSrc,
                                  pixman_image_t * pMask,
@@ -3508,7 +3508,7 @@ pixmanFillsse2 (uint32_t *bits,
     return TRUE;
 }
 
-void
+static void
 fbCompositeSolidMaskSrc_nx8x8888sse2 (pixman_op_t op,
                                     pixman_image_t * pSrc,
                                     pixman_image_t * pMask,
@@ -3643,7 +3643,7 @@ fbCompositeSolidMaskSrc_nx8x8888sse2 (pixman_op_t op,
  * fbCompositeSolidMask_nx8x0565
  */
 
-void
+static void
 fbCompositeSolidMask_nx8x0565sse2 (pixman_op_t op,
                                  pixman_image_t * pSrc,
                                  pixman_image_t * pMask,
@@ -3792,7 +3792,7 @@ fbCompositeSolidMask_nx8x0565sse2 (pixman_op_t op,
  * fbCompositeSrc_8888RevNPx0565
  */
 
-void
+static void
 fbCompositeSrc_8888RevNPx0565sse2 (pixman_op_t op,
                                  pixman_image_t * pSrc,
                                  pixman_image_t * pMask,
@@ -3925,7 +3925,7 @@ fbCompositeSrc_8888RevNPx0565sse2 (pixman_op_t op,
  * fbCompositeSrc_8888RevNPx8888
  */
 
-void
+static void
 fbCompositeSrc_8888RevNPx8888sse2 (pixman_op_t op,
                                  pixman_image_t * pSrc,
                                  pixman_image_t * pMask,
@@ -4038,7 +4038,7 @@ fbCompositeSrc_8888RevNPx8888sse2 (pixman_op_t op,
  * fbCompositeSolidMask_nx8888x0565C
  */
 
-void
+static void
 fbCompositeSolidMask_nx8888x0565Csse2 (pixman_op_t op,
                                      pixman_image_t * pSrc,
                                      pixman_image_t * pMask,
@@ -4186,7 +4186,7 @@ fbCompositeSolidMask_nx8888x0565Csse2 (pixman_op_t op,
  * fbCompositeIn_nx8x8
  */
 
-void
+static void
 fbCompositeIn_nx8x8sse2 (pixman_op_t op,
                        pixman_image_t * pSrc,
                        pixman_image_t * pMask,
@@ -4288,7 +4288,7 @@ fbCompositeIn_nx8x8sse2 (pixman_op_t op,
  * fbCompositeIn_8x8
  */
 
-void
+static void
 fbCompositeIn_8x8sse2 (pixman_op_t op,
                      pixman_image_t * pSrc,
                      pixman_image_t * pMask,
@@ -4377,7 +4377,7 @@ fbCompositeIn_8x8sse2 (pixman_op_t op,
  * fbCompositeSrcAdd_8888x8x8
  */
 
-void
+static void
 fbCompositeSrcAdd_8888x8x8sse2 (pixman_op_t op,
                               pixman_image_t * pSrc,
                               pixman_image_t * pMask,
@@ -4482,7 +4482,7 @@ fbCompositeSrcAdd_8888x8x8sse2 (pixman_op_t op,
  * fbCompositeSrcAdd_8000x8000
  */
 
-void
+static void
 fbCompositeSrcAdd_8000x8000sse2 (pixman_op_t op,
                                pixman_image_t * pSrc,
                                pixman_image_t * pMask,
@@ -4548,7 +4548,7 @@ fbCompositeSrcAdd_8000x8000sse2 (pixman_op_t op,
 /* -------------------------------------------------------------------------------------------------
  * fbCompositeSrcAdd_8888x8888
  */
-void
+static void
 fbCompositeSrcAdd_8888x8888sse2 (pixman_op_t   op,
                                pixman_image_t *        pSrc,
                                pixman_image_t *        pMask,
@@ -4725,7 +4725,7 @@ pixmanBltsse2 (uint32_t *src_bits,
     return TRUE;
 }
 
-void
+static void
 fbCompositeCopyAreasse2 (pixman_op_t       op,
                        pixman_image_t *        pSrc,
                        pixman_image_t *        pMask,
diff --git a/pixman/pixman-sse2.h b/pixman/pixman-sse2.h
index 783fcdf..417e31d 100644 (file)
--- a/pixman/pixman-sse2.h
+++ b/pixman/pixman-sse2.h
@@ -74,287 +74,6 @@ pixmanBltsse2 (uint32_t *src_bits,
                int dst_x, int dst_y,
                int width, int height);
 
-void
-fbCompositeSolid_nx8888sse2 (pixman_op_t op,
-                           pixman_image_t * pSrc,
-                           pixman_image_t * pMask,
-                           pixman_image_t * pDst,
-                           int16_t     xSrc,
-                           int16_t     ySrc,
-                           int16_t     xMask,
-                           int16_t     yMask,
-                           int16_t     xDst,
-                           int16_t     yDst,
-                           uint16_t    width,
-                           uint16_t    height);
-
-void
-fbCompositeSolid_nx0565sse2 (pixman_op_t op,
-                           pixman_image_t * pSrc,
-                           pixman_image_t * pMask,
-                           pixman_image_t * pDst,
-                           int16_t     xSrc,
-                           int16_t     ySrc,
-                           int16_t     xMask,
-                           int16_t     yMask,
-                           int16_t     xDst,
-                           int16_t     yDst,
-                           uint16_t    width,
-                           uint16_t    height);
-
-void
-fbCompositeSolidMask_nx8888x8888Csse2 (pixman_op_t op,
-                                     pixman_image_t * pSrc,
-                                     pixman_image_t * pMask,
-                                     pixman_image_t * pDst,
-                                     int16_t   xSrc,
-                                     int16_t   ySrc,
-                                     int16_t   xMask,
-                                     int16_t   yMask,
-                                     int16_t   xDst,
-                                     int16_t   yDst,
-                                     uint16_t  width,
-                                     uint16_t  height);
-
-void
-fbCompositeSrc_8888x8x8888sse2 (pixman_op_t op,
-                              pixman_image_t * pSrc,
-                              pixman_image_t * pMask,
-                              pixman_image_t * pDst,
-                              int16_t  xSrc,
-                              int16_t  ySrc,
-                              int16_t      xMask,
-                              int16_t      yMask,
-                              int16_t      xDst,
-                              int16_t      yDst,
-                              uint16_t     width,
-                              uint16_t     height);
-
-void
-fbCompositeSrc_x888xnx8888sse2 (pixman_op_t op,
-                              pixman_image_t * pSrc,
-                              pixman_image_t * pMask,
-                              pixman_image_t * pDst,
-                              int16_t  xSrc,
-                              int16_t  ySrc,
-                              int16_t      xMask,
-                              int16_t      yMask,
-                              int16_t      xDst,
-                              int16_t      yDst,
-                              uint16_t     width,
-                              uint16_t     height);
-
-void
-fbCompositeSrc_8888x8888sse2 (pixman_op_t op,
-                 pixman_image_t * pSrc,
-                 pixman_image_t * pMask,
-                 pixman_image_t * pDst,
-                 int16_t    xSrc,
-                 int16_t    ySrc,
-                 int16_t      xMask,
-                 int16_t      yMask,
-                 int16_t      xDst,
-                 int16_t      yDst,
-                 uint16_t     width,
-                 uint16_t     height);
-
-void
-fbCompositeSrc_8888x0565sse2 (pixman_op_t op,
-                 pixman_image_t * pSrc,
-                 pixman_image_t * pMask,
-                 pixman_image_t * pDst,
-                 int16_t      xSrc,
-                 int16_t      ySrc,
-                 int16_t      xMask,
-                 int16_t      yMask,
-                 int16_t      xDst,
-                 int16_t      yDst,
-                 uint16_t     width,
-                 uint16_t     height);
-
-void
-fbCompositeSolidMask_nx8x8888sse2 (pixman_op_t op,
-                                 pixman_image_t * pSrc,
-                                 pixman_image_t * pMask,
-                                 pixman_image_t * pDst,
-                                 int16_t      xSrc,
-                                 int16_t      ySrc,
-                                 int16_t      xMask,
-                                 int16_t      yMask,
-                                 int16_t      xDst,
-                                 int16_t      yDst,
-                                 uint16_t     width,
-                                 uint16_t     height);
-
-void
-fbCompositeSolidMaskSrc_nx8x8888sse2 (pixman_op_t op,
-                                    pixman_image_t * pSrc,
-                                    pixman_image_t * pMask,
-                                    pixman_image_t * pDst,
-                                    int16_t      xSrc,
-                                    int16_t      ySrc,
-                                    int16_t      xMask,
-                                    int16_t      yMask,
-                                    int16_t      xDst,
-                                    int16_t      yDst,
-                                    uint16_t     width,
-                                    uint16_t     height);
-
-void
-fbCompositeSolidMask_nx8x0565sse2 (pixman_op_t op,
-                                 pixman_image_t * pSrc,
-                                 pixman_image_t * pMask,
-                                 pixman_image_t * pDst,
-                                 int16_t      xSrc,
-                                 int16_t      ySrc,
-                                 int16_t      xMask,
-                                 int16_t      yMask,
-                                 int16_t      xDst,
-                                 int16_t      yDst,
-                                 uint16_t     width,
-                                 uint16_t     height);
-
-void
-fbCompositeSrc_8888RevNPx0565sse2 (pixman_op_t op,
-                                 pixman_image_t * pSrc,
-                                 pixman_image_t * pMask,
-                                 pixman_image_t * pDst,
-                                 int16_t      xSrc,
-                                 int16_t      ySrc,
-                                 int16_t      xMask,
-                                 int16_t      yMask,
-                                 int16_t      xDst,
-                                 int16_t      yDst,
-                                 uint16_t     width,
-                                 uint16_t     height);
-
-void
-fbCompositeSrc_8888RevNPx8888sse2 (pixman_op_t op,
-                                 pixman_image_t * pSrc,
-                                 pixman_image_t * pMask,
-                                 pixman_image_t * pDst,
-                                 int16_t      xSrc,
-                                 int16_t      ySrc,
-                                 int16_t      xMask,
-                                 int16_t      yMask,
-                                 int16_t      xDst,
-                                 int16_t      yDst,
-                                 uint16_t     width,
-                                 uint16_t     height);
-
-void
-fbCompositeSolidMask_nx8888x0565Csse2 (pixman_op_t op,
-                                     pixman_image_t * pSrc,
-                                     pixman_image_t * pMask,
-                                     pixman_image_t * pDst,
-                                     int16_t      xSrc,
-                                     int16_t      ySrc,
-                                     int16_t      xMask,
-                                     int16_t      yMask,
-                                     int16_t      xDst,
-                                     int16_t      yDst,
-                                     uint16_t     width,
-                                     uint16_t     height);
-
-void
-fbCompositeIn_nx8x8sse2 (pixman_op_t op,
-                       pixman_image_t * pSrc,
-                       pixman_image_t * pMask,
-                       pixman_image_t * pDst,
-                       int16_t      xSrc,
-                       int16_t      ySrc,
-                       int16_t      xMask,
-                       int16_t      yMask,
-                       int16_t      xDst,
-                       int16_t      yDst,
-                       uint16_t     width,
-                       uint16_t     height);
-
-void
-fbCompositeIn_8x8sse2 (pixman_op_t op,
-                     pixman_image_t * pSrc,
-                     pixman_image_t * pMask,
-                     pixman_image_t * pDst,
-                     int16_t      xSrc,
-                     int16_t      ySrc,
-                     int16_t      xMask,
-                     int16_t      yMask,
-                     int16_t      xDst,
-                     int16_t      yDst,
-                     uint16_t     width,
-                     uint16_t     height);
-
-void
-fbCompositeSrcAdd_8888x8x8sse2 (pixman_op_t op,
-                              pixman_image_t * pSrc,
-                              pixman_image_t * pMask,
-                              pixman_image_t * pDst,
-                              int16_t      xSrc,
-                              int16_t      ySrc,
-                              int16_t      xMask,
-                              int16_t      yMask,
-                              int16_t      xDst,
-                              int16_t      yDst,
-                              uint16_t     width,
-                              uint16_t     height);
-
-
-void
-fbCompositeSrcAdd_8000x8000sse2 (pixman_op_t op,
-                pixman_image_t * pSrc,
-                pixman_image_t * pMask,
-                pixman_image_t * pDst,
-                int16_t      xSrc,
-                int16_t      ySrc,
-                int16_t      xMask,
-                int16_t      yMask,
-                int16_t      xDst,
-                int16_t      yDst,
-                uint16_t     width,
-                uint16_t     height);
-
-void
-fbCompositeSrcAdd_8888x8888sse2 (pixman_op_t    op,
-                pixman_image_t *    pSrc,
-                pixman_image_t *    pMask,
-                pixman_image_t *     pDst,
-                int16_t      xSrc,
-                int16_t      ySrc,
-                int16_t      xMask,
-                int16_t      yMask,
-                int16_t      xDst,
-                int16_t      yDst,
-                uint16_t     width,
-                uint16_t     height);
-
-void
-fbCompositeCopyAreasse2 (pixman_op_t       op,
-                       pixman_image_t *        pSrc,
-                       pixman_image_t *        pMask,
-                       pixman_image_t *        pDst,
-                       int16_t         xSrc,
-                       int16_t         ySrc,
-                       int16_t         xMask,
-                       int16_t         yMask,
-                       int16_t         xDst,
-                       int16_t         yDst,
-                       uint16_t                width,
-                       uint16_t                height);
-
-void
-fbCompositeOver_x888x8x8888sse2 (pixman_op_t      op,
-                               pixman_image_t * pSrc,
-                               pixman_image_t * pMask,
-                               pixman_image_t * pDst,
-                               int16_t      xSrc,
-                               int16_t      ySrc,
-                               int16_t      xMask,
-                               int16_t      yMask,
-                               int16_t      xDst,
-                               int16_t      yDst,
-                               uint16_t     width,
-                               uint16_t     height);
-
 #endif /* USE_SSE2 */
 
 #endif /* _PIXMAN_SSE_H_ */
Domain: Graphics System / Rendering Engine;