gallium: move sse intrinsics debug helpers to u_sse.h

diff --git a/src/gallium/auxiliary/util/u_sse.h b/src/gallium/auxiliary/util/u_sse.h
index 03198c91da462ba32eab1a071529c48b1422472a..8fd0e52a3a4ec83130af8ce27fd14bd7e56f24b4 100644 (file)
--- a/src/gallium/auxiliary/util/u_sse.h
+++ b/src/gallium/auxiliary/util/u_sse.h
@@ -72,6 +72,84 @@ _mm_castps_si128(__m128 a)
 #endif /* defined(_MSC_VER) && _MSC_VER < 1500 */
 
 
+static INLINE void u_print_epi8(const char *name, __m128i r)
+{
+   union { __m128i m; ubyte ub[16]; } u;
+   u.m = r;
+
+   debug_printf("%s: "
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x/"
+                "%02x\n",
+                name,
+                u.ub[0],  u.ub[1],  u.ub[2],  u.ub[3],
+                u.ub[4],  u.ub[5],  u.ub[6],  u.ub[7],
+                u.ub[8],  u.ub[9],  u.ub[10], u.ub[11],
+                u.ub[12], u.ub[13], u.ub[14], u.ub[15]);
+}
+
+static INLINE void u_print_epi16(const char *name, __m128i r)
+{
+   union { __m128i m; ushort us[8]; } u;
+   u.m = r;
+
+   debug_printf("%s: "
+                "%04x/"
+                "%04x/"
+                "%04x/"
+                "%04x/"
+                "%04x/"
+                "%04x/"
+                "%04x/"
+                "%04x\n",
+                name,
+                u.us[0],  u.us[1],  u.us[2],  u.us[3],
+                u.us[4],  u.us[5],  u.us[6],  u.us[7]);
+}
+
+static INLINE void u_print_epi32(const char *name, __m128i r)
+{
+   union { __m128i m; uint ui[4]; } u;
+   u.m = r;
+
+   debug_printf("%s: "
+                "%08x/"
+                "%08x/"
+                "%08x/"
+                "%08x\n",
+                name,
+                u.ui[0],  u.ui[1],  u.ui[2],  u.ui[3]);
+}
+
+static INLINE void u_print_ps(const char *name, __m128 r)
+{
+   union { __m128 m; float f[4]; } u;
+   u.m = r;
+
+   debug_printf("%s: "
+                "%f/"
+                "%f/"
+                "%f/"
+                "%f\n",
+                name,
+                u.f[0],  u.f[1],  u.f[2],  u.f[3]);
+}
+
+
+
 #if defined(PIPE_ARCH_SSSE3)
 
 #include <tmmintrin.h>
@@ -98,6 +176,6 @@ _mm_shuffle_epi8(__m128i a, __m128i mask)
 #endif /* !PIPE_ARCH_SSSE3 */
 
 
-#endif /* PIPE_ARCH_X86 || PIPE_ARCH_X86_64 */
+#endif /* PIPE_ARCH_SSE */
 
 #endif /* U_SSE_H_ */

diff --git a/src/gallium/drivers/llvmpipe/lp_debug_intrin.h b/src/gallium/drivers/llvmpipe/lp_debug_intrin.h
deleted file mode 100644 (file)
index 5237e78..0000000
--- a/src/gallium/drivers/llvmpipe/lp_debug_intrin.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2010 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- **************************************************************************/
-
-#ifndef _LP_DEBUG_INTRIN_H_
-#define _LP_DEBUG_INTRIN_H_
-
-#include "pipe/p_config.h"
-
-#if defined(PIPE_ARCH_SSE)
-
-#include <emmintrin.h>
-
-static INLINE void print_epi8(const char *name, __m128i r)
-{
-   union { __m128i m; ubyte ub[16]; } u;
-   u.m = r;
-
-   debug_printf("%s: "
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x/"
-                "%02x\n",
-                name,
-                u.ub[0],  u.ub[1],  u.ub[2],  u.ub[3],
-                u.ub[4],  u.ub[5],  u.ub[6],  u.ub[7],
-                u.ub[8],  u.ub[9],  u.ub[10], u.ub[11],
-                u.ub[12], u.ub[13], u.ub[14], u.ub[15]);
-}
-
-static INLINE void print_epi16(const char *name, __m128i r)
-{
-   union { __m128i m; ushort us[8]; } u;
-   u.m = r;
-
-   debug_printf("%s: "
-                "%04x/"
-                "%04x/"
-                "%04x/"
-                "%04x/"
-                "%04x/"
-                "%04x/"
-                "%04x/"
-                "%04x\n",
-                name,
-                u.us[0],  u.us[1],  u.us[2],  u.us[3],
-                u.us[4],  u.us[5],  u.us[6],  u.us[7]);
-}
-
-static INLINE void print_epi32(const char *name, __m128i r)
-{
-   union { __m128i m; uint ui[4]; } u;
-   u.m = r;
-
-   debug_printf("%s: "
-                "%08x/"
-                "%08x/"
-                "%08x/"
-                "%08x\n",
-                name,
-                u.ui[0],  u.ui[1],  u.ui[2],  u.ui[3]);
-}
-
-static INLINE void print_ps(const char *name, __m128 r)
-{
-   union { __m128 m; float f[4]; } u;
-   u.m = r;
-
-   debug_printf("%s: "
-                "%f/"
-                "%f/"
-                "%f/"
-                "%f\n",
-                name,
-                u.f[0],  u.f[1],  u.f[2],  u.f[3]);
-}
-
- 
-#endif
-#endif

diff --git a/src/gallium/drivers/llvmpipe/lp_rast_tri.c b/src/gallium/drivers/llvmpipe/lp_rast_tri.c
index 5e8918b1d871624540382110a5bd5520ad578736..19b0bd686a886e8bf11348a850b943ba19e5e481 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_rast_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast_tri.c
@@ -32,7 +32,6 @@
 #include <limits.h>
 #include "util/u_math.h"
 #include "lp_debug.h"
-#include "lp_debug_intrin.h"
 #include "lp_perf.h"
 #include "lp_rast_priv.h"
 #include "lp_tile_soa.h"