Delete ARM header files

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 04e96cb..6866085 100644 (file)
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -90,8 +90,7 @@ endif
 if USE_ARM_SIMD
 noinst_LTLIBRARIES += libpixman-arm-simd.la
 libpixman_arm_simd_la_SOURCES = \
-       pixman-arm-simd.c \
-       pixman-arm-simd.h
+       pixman-arm-simd.c
 libpixman_arm_simd_la_CFLAGS = $(DEP_CFLAGS) $(ARM_SIMD_CFLAGS)
 libpixman_arm_simd_la_LIBADD = $(DEP_LIBS)
 libpixman_1_la_LIBADD += libpixman-arm-simd.la
@@ -101,8 +100,7 @@ endif
 if USE_ARM_NEON
 noinst_LTLIBRARIES += libpixman-arm-neon.la
 libpixman_arm_neon_la_SOURCES = \
-        pixman-arm-neon.c \
-        pixman-arm-neon.h
+        pixman-arm-neon.c
 libpixman_arm_neon_la_CFLAGS = $(DEP_CFLAGS) $(ARM_NEON_CFLAGS)
 libpixman_arm_neon_la_LIBADD = $(DEP_LIBS)
 libpixman_1_la_LIBADD += libpixman-arm-neon.la

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 866c707..fcd64e5 100644 (file)
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -30,8 +30,6 @@
 #include <config.h>
 #endif
 
-#include "pixman-arm-neon.h"
-
 #include <arm_neon.h>
 #include <string.h>
 

diff --git a/pixman/pixman-arm-neon.h b/pixman/pixman-arm-neon.h
deleted file mode 100644 (file)
index 19eebec..0000000
--- a/pixman/pixman-arm-neon.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright © 2009 ARM Ltd
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of ARM Ltd not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  ARM Ltd makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author:  Ian Rickards (ian.rickards@arm.com) 
- *
- */
-
-#include "pixman-private.h"
-
-#ifdef USE_ARM_NEON
-
-pixman_bool_t pixman_have_arm_neon(void);
-
-#else
-#define pixman_have_arm_neon() FALSE
-#endif
-
-#ifdef USE_ARM_NEON
-
-extern const pixman_fast_path_t *const arm_neon_fast_paths;
-
-void
-fbCompositeSrcAdd_8000x8000neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                        int32_t      xSrc,
-                        int32_t      ySrc,
-                        int32_t      xMask,
-                        int32_t      yMask,
-                        int32_t      xDst,
-                        int32_t      yDst,
-                        int32_t      width,
-                        int32_t      height);
-
-void
-fbCompositeSrc_8888x8888neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                       pixman_image_t * pSrc,
-                       pixman_image_t * pMask,
-                       pixman_image_t * pDst,
-                       int32_t      xSrc,
-                       int32_t      ySrc,
-                       int32_t      xMask,
-                       int32_t      yMask,
-                       int32_t      xDst,
-                       int32_t      yDst,
-                       int32_t      width,
-                       int32_t      height);
-
-void
-fbCompositeSrc_8888x8x8888neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                       pixman_image_t * pSrc,
-                       pixman_image_t * pMask,
-                       pixman_image_t * pDst,
-                       int32_t      xSrc,
-                       int32_t      ySrc,
-                       int32_t      xMask,
-                       int32_t      yMask,
-                       int32_t      xDst,
-                       int32_t      yDst,
-                       int32_t      width,
-                       int32_t      height);
-
-void
-fbCompositeSolidMask_nx8x0565neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                        int32_t      xSrc,
-                        int32_t      ySrc,
-                        int32_t      xMask,
-                        int32_t      yMask,
-                        int32_t      xDst,
-                        int32_t      yDst,
-                        int32_t      width,
-                        int32_t      height);
-
-void
-fbCompositeSolidMask_nx8x8888neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                       pixman_image_t * pSrc,
-                       pixman_image_t * pMask,
-                       pixman_image_t * pDst,
-                       int32_t      xSrc,
-                       int32_t      ySrc,
-                       int32_t      xMask,
-                       int32_t      yMask,
-                       int32_t      xDst,
-                       int32_t      yDst,
-                       int32_t      width,
-                       int32_t      height);
-
-void
-fbCompositeSrcAdd_8888x8x8neon (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                        int32_t      xSrc,
-                        int32_t      ySrc,
-                        int32_t      xMask,
-                        int32_t      yMask,
-                        int32_t      xDst,
-                        int32_t      yDst,
-                        int32_t      width,
-                        int32_t      height);
-
-void
-fbCompositeSrc_16x16neon (
-       pixman_implementation_t * impl,
-       pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-       int32_t      xSrc,
-       int32_t      ySrc,
-       int32_t      xMask,
-       int32_t      yMask,
-       int32_t      xDst,
-       int32_t      yDst,
-       int32_t      width,
-       int32_t      height);
-
-void
-fbCompositeSrc_24x16neon (
-       pixman_implementation_t * impl,
-       pixman_op_t op,
-       pixman_image_t * pSrc,
-       pixman_image_t * pMask,
-       pixman_image_t * pDst,
-       int32_t      xSrc,
-       int32_t      ySrc,
-       int32_t      xMask,
-       int32_t      yMask,
-       int32_t      xDst,
-       int32_t      yDst,
-       int32_t      width,
-       int32_t      height);
-
-pixman_bool_t
-pixman_fill_neon (uint32_t *bits,
-                 int stride,
-                 int bpp,
-                 int x,
-                 int y,
-                 int width,
-                 int height,
-                 uint32_t _xor);
-
-#endif /* USE_ARM_NEON */

diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index 01b017d..fdd3034 100644 (file)
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif
 
-#include "pixman-arm-simd.h"
-
 void
 fbCompositeSrcAdd_8000x8000arm (
                             pixman_implementation_t * impl,

diff --git a/pixman/pixman-arm-simd.h b/pixman/pixman-arm-simd.h
deleted file mode 100644 (file)
index c76315a..0000000
--- a/pixman/pixman-arm-simd.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright © 2008 Mozilla Corporation
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Mozilla Corporation not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Mozilla Corporation makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- * Author:  Jeff Muizelaar (jeff@infidigm.net)
- *
- */
-
-#include "pixman-private.h"
-
-#ifdef USE_ARM_SIMD
-
-pixman_bool_t pixman_have_arm_simd(void);
-
-#else
-#define pixman_have_arm_simd() FALSE
-#endif
-
-#ifdef USE_ARM_SIMD
-
-extern const pixman_fast_path_t *const arm_simd_fast_paths;
-
-void
-fbCompositeSrcAdd_8000x8000arm (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                               pixman_image_t * pSrc,
-                               pixman_image_t * pMask,
-                               pixman_image_t * pDst,
-                               int32_t      xSrc,
-                               int32_t      ySrc,
-                               int32_t      xMask,
-                               int32_t      yMask,
-                               int32_t      xDst,
-                               int32_t      yDst,
-                               int32_t      width,
-                               int32_t      height);
-
-void
-fbCompositeSrc_8888x8888arm (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                               int32_t      xSrc,
-                               int32_t      ySrc,
-                               int32_t      xMask,
-                               int32_t      yMask,
-                               int32_t      xDst,
-                               int32_t      yDst,
-                               int32_t      width,
-                               int32_t      height);
-
-void
-fbCompositeSrc_8888x8x8888arm (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                               int32_t      xSrc,
-                               int32_t      ySrc,
-                               int32_t      xMask,
-                               int32_t      yMask,
-                               int32_t      xDst,
-                               int32_t      yDst,
-                               int32_t      width,
-                               int32_t      height);
-
-void
-fbCompositeSolidMask_nx8x8888arm (
-                            pixman_implementation_t * impl,
-                            pixman_op_t op,
-                        pixman_image_t * pSrc,
-                        pixman_image_t * pMask,
-                        pixman_image_t * pDst,
-                               int32_t      xSrc,
-                               int32_t      ySrc,
-                               int32_t      xMask,
-                               int32_t      yMask,
-                               int32_t      xDst,
-                               int32_t      yDst,
-                               int32_t      width,
-                               int32_t      height);
-
-
-#endif /* USE_ARM */