pixman: Branch 'master' - 2 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Thu Jun 25 09:41:46 PDT 2009
pixman/Makefile.am | 6 -
pixman/pixman-arm-neon.c | 26 +++---
pixman/pixman-arm-neon.h | 179 -----------------------------------------------
pixman/pixman-arm-simd.c | 10 +-
pixman/pixman-arm-simd.h | 106 ---------------------------
5 files changed, 18 insertions(+), 309 deletions(-)
New commits:
commit 9a7ce32ef5cf70a17d83154cfd1b96aa54ce9232
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Thu Jun 25 12:42:03 2009 -0400
Make arm compositing functions static
diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index fcd64e5..b4f9a27 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -122,7 +122,7 @@ static force_inline uint8x8x4_t neon8qadd(uint8x8x4_t x, uint8x8x4_t y)
}
-void
+static void
fbCompositeSrcAdd_8000x8000neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -272,7 +272,7 @@ fbCompositeSrcAdd_8000x8000neon (
}
-void
+static void
fbCompositeSrc_8888x8888neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -433,7 +433,7 @@ fbCompositeSrc_8888x8888neon (
}
}
-void
+static void
fbCompositeSrc_8888x8x8888neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -630,7 +630,7 @@ fbCompositeSrc_8888x8x8888neon (
}
-void
+static void
fbCompositeSolidMask_nx8x8888neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -836,7 +836,7 @@ fbCompositeSolidMask_nx8x8888neon (
}
-void
+static void
fbCompositeSrcAdd_8888x8x8neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -955,7 +955,7 @@ fbCompositeSrcAdd_8888x8x8neon (
#ifdef USE_GCC_INLINE_ASM
-void
+static void
fbCompositeSrc_16x16neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -1082,7 +1082,7 @@ fbCompositeSrc_16x16neon (
#endif /* USE_GCC_INLINE_ASM */
-void
+static void
fbCompositeSrc_24x16neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -1300,7 +1300,7 @@ fbCompositeSrc_24x16neon (
}
-pixman_bool_t
+static pixman_bool_t
pixman_fill_neon (uint32_t *bits,
int stride,
int bpp,
@@ -1709,7 +1709,7 @@ static inline void SolidOver565_8pix_neon(
#endif
}
-void
+static void
fbCompositeSolidMask_nx8x0565neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -1851,7 +1851,7 @@ static inline void PlainOver565_8pix_neon(
);
}
-void
+static void
fbCompositeSolid_nx0565neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -1981,7 +1981,7 @@ static inline void ARGB8_Over565_8pix_neon(
);
}
-void
+static void
fbCompositeOver_8888x0565neon (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -2156,7 +2156,7 @@ arm_neon_composite (pixman_implementation_t *imp,
width, height);
}
-pixman_bool_t
+static pixman_bool_t
pixman_blt_neon (
void *src_bits,
void *dst_bits,
diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index fdd3034..1b7c14d 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -27,7 +27,7 @@
#include <config.h>
#endif
-void
+static void
fbCompositeSrcAdd_8000x8000arm (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -97,7 +97,7 @@ fbCompositeSrcAdd_8000x8000arm (
}
-void
+static void
fbCompositeSrc_8888x8888arm (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -190,7 +190,7 @@ fbCompositeSrc_8888x8888arm (
}
}
-void
+static void
fbCompositeSrc_8888x8x8888arm (
pixman_implementation_t * impl,
pixman_op_t op,
@@ -299,7 +299,7 @@ fbCompositeSrc_8888x8x8888arm (
}
}
-void
+static void
fbCompositeSolidMask_nx8x8888arm (
pixman_implementation_t * impl,
pixman_op_t op,
commit 9d3f71d726c8b959b64c3e6b43ca4d3ccb320c32
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Thu Jun 25 10:20:44 2009 -0400
Delete ARM header files
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 04e96cb..6866085 100644
--- 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
--- 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
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 at 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
--- 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
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 at 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 */
More information about the xorg-commit
mailing list