From 41a9a17e0308f2075bb1bd59c4411e43a67d49ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Wed, 13 May 2009 11:31:30 -0400 Subject: [PATCH] Delete pixman-sse2.h and pixman-mmx.h --- pixman/pixman-general.c | 2 -- pixman/pixman-mmx.c | 44 ---------------------------------- pixman/pixman-mmx.h | 64 ------------------------------------------------- pixman/pixman-sse2.c | 3 +-- pixman/pixman-sse2.h | 64 ------------------------------------------------- pixman/pixman-utils.c | 2 -- 6 files changed, 1 insertion(+), 178 deletions(-) delete mode 100644 pixman/pixman-mmx.h delete mode 100644 pixman/pixman-sse2.h diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c index 7d0f1fb..069e301 100644 --- a/pixman/pixman-general.c +++ b/pixman/pixman-general.c @@ -35,9 +35,7 @@ #include #include #include "pixman-private.h" -#include "pixman-mmx.h" #include "pixman-vmx.h" -#include "pixman-sse2.h" #include "pixman-arm-simd.h" #include "pixman-combine32.h" #include "pixman-private.h" diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c index c12ba53..957aed2 100644 --- a/pixman/pixman-mmx.c +++ b/pixman/pixman-mmx.c @@ -38,8 +38,6 @@ #include #include "pixman-private.h" -#include "pixman-mmx.h" - #define noVERBOSE #ifdef VERBOSE @@ -917,48 +915,6 @@ mmxCombineAddC (pixman_implementation_t *imp, pixman_op_t op, _mm_empty(); } -void -fbComposeSetupMMX(void) -{ - static pixman_bool_t initialized = FALSE; - - if (initialized) - return; - - /* check if we have MMX support and initialize accordingly */ - if (pixman_have_mmx()) - { -#if 0 - pixman_composeFunctions.combineU[PIXMAN_OP_OVER] = mmxCombineOverU; - pixman_composeFunctions.combineU[PIXMAN_OP_OVER_REVERSE] = mmxCombineOverReverseU; - pixman_composeFunctions.combineU[PIXMAN_OP_IN] = mmxCombineInU; - pixman_composeFunctions.combineU[PIXMAN_OP_IN_REVERSE] = mmxCombineInReverseU; - pixman_composeFunctions.combineU[PIXMAN_OP_OUT] = mmxCombineOutU; - pixman_composeFunctions.combineU[PIXMAN_OP_OUT_REVERSE] = mmxCombineOutReverseU; - pixman_composeFunctions.combineU[PIXMAN_OP_ATOP] = mmxCombineAtopU; - pixman_composeFunctions.combineU[PIXMAN_OP_ATOP_REVERSE] = mmxCombineAtopReverseU; - pixman_composeFunctions.combineU[PIXMAN_OP_XOR] = mmxCombineXorU; - pixman_composeFunctions.combineU[PIXMAN_OP_ADD] = mmxCombineAddU; - pixman_composeFunctions.combineU[PIXMAN_OP_SATURATE] = mmxCombineSaturateU; - - pixman_composeFunctions.combineC[PIXMAN_OP_SRC] = mmxCombineSrcC; - pixman_composeFunctions.combineC[PIXMAN_OP_OVER] = mmxCombineOverC; - pixman_composeFunctions.combineC[PIXMAN_OP_OVER_REVERSE] = mmxCombineOverReverseC; - pixman_composeFunctions.combineC[PIXMAN_OP_IN] = mmxCombineInC; - pixman_composeFunctions.combineC[PIXMAN_OP_IN_REVERSE] = mmxCombineInReverseC; - pixman_composeFunctions.combineC[PIXMAN_OP_OUT] = mmxCombineOutC; - pixman_composeFunctions.combineC[PIXMAN_OP_OUT_REVERSE] = mmxCombineOutReverseC; - pixman_composeFunctions.combineC[PIXMAN_OP_ATOP] = mmxCombineAtopC; - pixman_composeFunctions.combineC[PIXMAN_OP_ATOP_REVERSE] = mmxCombineAtopReverseC; - pixman_composeFunctions.combineC[PIXMAN_OP_XOR] = mmxCombineXorC; - pixman_composeFunctions.combineC[PIXMAN_OP_ADD] = mmxCombineAddC; -#endif - } - - initialized = TRUE; -} - - /* ------------------ MMX code paths called from fbpict.c ----------------------- */ static void diff --git a/pixman/pixman-mmx.h b/pixman/pixman-mmx.h deleted file mode 100644 index 250410a..0000000 --- a/pixman/pixman-mmx.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright © 2004 Red Hat, Inc. - * Copyright © 2005 Trolltech AS - * - * 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 Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat 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: Søren Sandmann (sandmann@redhat.com) - * Lars Knoll (lars@trolltech.com) - * - * Based on work by Owen Taylor - */ -#ifndef _PIXMAN_MMX_H_ -#define _PIXMAN_MMX_H_ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "pixman-private.h" - -#ifdef USE_MMX - -#if !defined(__amd64__) && !defined(__x86_64__) -pixman_bool_t pixman_have_mmx(void); -#else -#define pixman_have_mmx() TRUE -#endif - -#else -#define pixman_have_mmx() FALSE -#endif - -#ifdef USE_MMX - -pixman_bool_t -pixman_fill_mmx (uint32_t *bits, - int stride, - int bpp, - int x, - int y, - int width, - int height, - uint32_t xor); - -#endif /* USE_MMX */ - -#endif /* _PIXMAN_MMX_H_ */ diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index a2a5bb0..a574787 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -33,8 +33,7 @@ #include #include /* for _mm_shuffle_pi16 and _MM_SHUFFLE */ #include /* for SSE2 intrinsics */ - -#include "pixman-sse2.h" +#include "pixman-private.h" #ifdef USE_SSE2 diff --git a/pixman/pixman-sse2.h b/pixman/pixman-sse2.h deleted file mode 100644 index dec5f86..0000000 --- a/pixman/pixman-sse2.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright © 2008 Rodrigo Kumpera - * Copyright © 2008 André Tupinambá - * - * 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 Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat 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: Rodrigo Kumpera (kumpera@gmail.com) - * André Tupinambá (andrelrt@gmail.com) - * - * Based on work by Owen Taylor and Søren Sandmann - */ -#ifndef _PIXMAN_SSE_H_ -#define _PIXMAN_SSE_H_ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "pixman-private.h" - -#ifdef USE_SSE2 - -#if !defined(__amd64__) && !defined(__x86_64__) -pixman_bool_t pixman_have_sse2(void); -#else -#define pixman_have_sse2() TRUE -#endif - -#else -#define pixman_have_sse2() FALSE -#endif - -#ifdef USE_SSE2 - -pixman_bool_t -pixmanFillsse2 (uint32_t *bits, - int stride, - int bpp, - int x, - int y, - int width, - int height, - uint32_t data); - -#endif /* USE_SSE2 */ - -#endif /* _PIXMAN_SSE_H_ */ diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c index 5c43e64..ffb1444 100644 --- a/pixman/pixman-utils.c +++ b/pixman/pixman-utils.c @@ -28,8 +28,6 @@ #include #include "pixman-private.h" -#include "pixman-mmx.h" -#include "pixman-sse2.h" /* * Compute the smallest value no less than y which is on a -- 2.7.4