Rename FastPathInfo to pixman_fast_path_t

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 37ae9f2..966704a 100644 (file)
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -2092,7 +2092,7 @@ fbCompositeOver_8888x0565neon (
 
 #endif  // USE_GCC_INLINE_ASM
 
-static const FastPathInfo arm_neon_fast_path_array[] = 
+static const pixman_fast_path_t arm_neon_fast_path_array[] = 
 {
     { PIXMAN_OP_ADD,  PIXMAN_solid,    PIXMAN_a8,       PIXMAN_a8,       fbCompositeSrcAdd_8888x8x8neon,        0 },
     { PIXMAN_OP_ADD,  PIXMAN_a8,       PIXMAN_null,     PIXMAN_a8,       fbCompositeSrcAdd_8000x8000neon,       0 },
@@ -2123,7 +2123,7 @@ static const FastPathInfo arm_neon_fast_path_array[] =
     { PIXMAN_OP_NONE },
 };
 
-const FastPathInfo *const arm_neon_fast_paths = arm_neon_fast_path_array;
+const pixman_fast_path_t *const arm_neon_fast_paths = arm_neon_fast_path_array;
 
 static void
 arm_neon_composite (pixman_implementation_t *imp,

diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
index aed7a4d..19eebec 100644 (file)
--- a/pixman/pixman-arm-neon.h
+++ b/pixman/pixman-arm-neon.h
@@ -36,7 +36,7 @@ pixman_bool_t pixman_have_arm_neon(void);
 
 #ifdef USE_ARM_NEON
 
-extern const FastPathInfo *const arm_neon_fast_paths;
+extern const pixman_fast_path_t *const arm_neon_fast_paths;
 
 void
 fbCompositeSrcAdd_8000x8000neon (

diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index 951f847..0b9c529 100644 (file)
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -416,7 +416,7 @@ fbCompositeSolidMask_nx8x8888arm (
     }
 }
 
-static const FastPathInfo arm_simd_fast_path_array[] =
+static const pixman_fast_path_t arm_simd_fast_path_array[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm,      0 },
     { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,    PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8888arm,      0 },
@@ -435,7 +435,7 @@ static const FastPathInfo arm_simd_fast_path_array[] =
     { PIXMAN_OP_NONE },
 };
 
-const FastPathInfo *const arm_simd_fast_paths = arm_simd_fast_path_array;
+const pixman_fast_path_t *const arm_simd_fast_paths = arm_simd_fast_path_array;
 
 static void
 arm_simd_composite (pixman_implementation_t *imp,

diff --git a/pixman/pixman-arm-simd.h b/pixman/pixman-arm-simd.h
index 8c1f883..c76315a 100644 (file)
--- a/pixman/pixman-arm-simd.h
+++ b/pixman/pixman-arm-simd.h
@@ -36,7 +36,7 @@ pixman_bool_t pixman_have_arm_simd(void);
 
 #ifdef USE_ARM_SIMD
 
-extern const FastPathInfo *const arm_simd_fast_paths;
+extern const pixman_fast_path_t *const arm_simd_fast_paths;
 
 void
 fbCompositeSrcAdd_8000x8000arm (

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 67510c3..0620420 100644 (file)
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -1010,7 +1010,7 @@ fbCompositeSrc_8888xx888 (pixman_implementation_t *imp,
     }
 }
 
-static const FastPathInfo c_fast_paths[] =
+static const pixman_fast_path_t c_fast_paths[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_r5g6b5,   fbCompositeSolidMask_nx8x0565, 0 },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_b5g6r5,   fbCompositeSolidMask_nx8x0565, 0 },

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index 293f425..350a048 100644 (file)
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -3018,7 +3018,7 @@ fbCompositeOver_x888x8x8888mmx (pixman_implementation_t *imp,
     _mm_empty();
 }
 
-static const FastPathInfo mmx_fast_paths[] =
+static const pixman_fast_path_t mmx_fast_paths[] =
 {
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_r5g6b5,   fbCompositeSolidMask_nx8x0565mmx,     0 },
     { PIXMAN_OP_OVER, PIXMAN_solid,    PIXMAN_a8,       PIXMAN_b5g6r5,   fbCompositeSolidMask_nx8x0565mmx,     0 },

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 66fab9d..4fae0fc 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -894,7 +894,7 @@ typedef struct
     pixman_format_code_t       dest_format;
     pixman_composite_func_t    func;
     uint32_t                   flags;
-} FastPathInfo;
+} pixman_fast_path_t;
 
 struct pixman_implementation_t
 {
@@ -1009,7 +1009,7 @@ _pixman_implementation_create_vmx (void);
 #endif
 
 pixman_bool_t
-_pixman_run_fast_path (const FastPathInfo *paths,
+_pixman_run_fast_path (const pixman_fast_path_t *paths,
                       pixman_implementation_t *imp,
                       pixman_op_t op,
                       pixman_image_t *src,

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 0709a3b..0908fc9 100644 (file)
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -4869,7 +4869,7 @@ fbCompositeOver_x888x8x8888sse2 (pixman_implementation_t *imp,
 }
 #endif
 
-static const FastPathInfo sse2_fast_paths[] =
+static const pixman_fast_path_t 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 },

diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index c13bc3b..c09bff4 100644 (file)
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -663,15 +663,15 @@ mask_is_solid (pixman_image_t *mask)
     return FALSE;
 }
 
-static const FastPathInfo *
-get_fast_path (const FastPathInfo *fast_paths,
+static const pixman_fast_path_t *
+get_fast_path (const pixman_fast_path_t *fast_paths,
               pixman_op_t         op,
               pixman_image_t     *pSrc,
               pixman_image_t     *pMask,
               pixman_image_t     *pDst,
               pixman_bool_t       is_pixbuf)
 {
-    const FastPathInfo *info;
+    const pixman_fast_path_t *info;
 
     for (info = fast_paths; info->op != PIXMAN_OP_NONE; info++)
     {
@@ -740,7 +740,7 @@ image_covers (pixman_image_t *image, pixman_box32_t *extents)
 }
 
 pixman_bool_t
-_pixman_run_fast_path (const FastPathInfo *paths,
+_pixman_run_fast_path (const pixman_fast_path_t *paths,
                       pixman_implementation_t *imp,
                       pixman_op_t op,
                       pixman_image_t *src,
@@ -776,7 +776,7 @@ _pixman_run_fast_path (const FastPathInfo *paths,
        && !dest->common.read_func
        && !dest->common.write_func)
     {
-       const FastPathInfo *info;       
+       const pixman_fast_path_t *info; 
        pixman_bool_t pixbuf;
 
        pixbuf =

diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index 96d5488..c57cb1e 100644 (file)
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -1548,12 +1548,12 @@ fbCompositeSolid_nx0565vmx (pixman_operator_t   op,
     }
 }
 
-static const FastPathInfo vmx_fast_path_array[] =
+static const pixman_fast_path_t vmx_fast_path_array[] =
 {
     { PIXMAN_OP_NONE },
 };
 
-const FastPathInfo *const vmx_fast_paths = vmx_fast_path_array;
+const pixman_fast_path_t *const vmx_fast_paths = vmx_fast_path_array;
 
 #endif