From 5dc9671b2588bfe084d69789e5c367474c5efa92 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann@redhat.com>
Date: Wed, 13 May 2009 11:27:01 -0400
Subject: [PATCH] Make the fast_path implementation run the c_fast_paths

---
 pixman/pixman-fast-path.c | 14 +++++++++++---
 pixman/pixman-general.c   |  8 --------
 pixman/pixman-private.h   |  2 --
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index c24258e..5f78bc3 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -1021,7 +1021,7 @@ fbCompositeSrc_8888xx888 (pixman_implementation_t *imp,
     }
 }
 
-static const FastPathInfo c_fast_path_array[] =
+static const FastPathInfo 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 },
@@ -1070,8 +1070,6 @@ static const FastPathInfo c_fast_path_array[] =
     { PIXMAN_OP_NONE },
 };
 
-const FastPathInfo *const c_fast_paths = c_fast_path_array;
-
 static void
 fbCompositeSrcScaleNearest (pixman_implementation_t *imp,
 			    pixman_op_t     op,
@@ -1215,6 +1213,16 @@ fast_path_composite (pixman_implementation_t *imp,
 	}
     }
 
+    if (_pixman_run_fast_path (c_fast_paths, imp,
+			       op, src, mask, dest,
+			       src_x, src_y,
+			       mask_x, mask_y,
+			       dest_x, dest_y,
+			       width, height))
+    {
+	return;
+    }
+
     _pixman_implementation_composite (imp->delegate, op,
 				      src, mask, dest,
 				      src_x, src_y,
diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 4693823..7d0f1fb 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -404,14 +404,6 @@ general_composite (pixman_implementation_t *	imp,
 	return;
 #endif
 
-    if (pixman_have_arm_simd() && _pixman_run_fast_path (c_fast_paths, imp,
-							 op, src, mask, dest,
-							 src_x, src_y,
-							 mask_x, mask_y,
-							 dest_x, dest_y,
-							 width, height))
-	return;
-    
     /* CompositeGeneral optimizes 1x1 repeating images itself */
     if (src->type == BITS &&
 	src->bits.width == 1 && src->bits.height == 1)
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index adee672..2367261 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -956,8 +956,6 @@ typedef struct
     uint32_t			flags;
 } FastPathInfo;
 
-extern const FastPathInfo *const c_fast_paths;
-
 struct pixman_implementation_t
 {
     pixman_implementation_t *	toplevel;
-- 
2.7.4