aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/x86')
-rw-r--r--src/mesa/x86/3dnow_xform1.S3
-rw-r--r--src/mesa/x86/3dnow_xform2.S3
-rw-r--r--src/mesa/x86/3dnow_xform3.S3
-rw-r--r--src/mesa/x86/3dnow_xform4.S3
-rw-r--r--src/mesa/x86/common_x86_asm.S1
-rw-r--r--src/mesa/x86/gen_matypes.c146
-rw-r--r--src/mesa/x86/mmx_blend.S3
-rw-r--r--src/mesa/x86/sse_normal.S3
-rw-r--r--src/mesa/x86/sse_xform1.S3
-rw-r--r--src/mesa/x86/sse_xform2.S3
-rw-r--r--src/mesa/x86/sse_xform3.S3
-rw-r--r--src/mesa/x86/sse_xform4.S3
-rw-r--r--src/mesa/x86/x86_cliptest.S3
-rw-r--r--src/mesa/x86/x86_xform2.S3
-rw-r--r--src/mesa/x86/x86_xform3.S3
-rw-r--r--src/mesa/x86/x86_xform4.S3
16 files changed, 28 insertions, 161 deletions
diff --git a/src/mesa/x86/3dnow_xform1.S b/src/mesa/x86/3dnow_xform1.S
index 939cd209858..2b157bb0e27 100644
--- a/src/mesa/x86/3dnow_xform1.S
+++ b/src/mesa/x86/3dnow_xform1.S
@@ -25,7 +25,8 @@
#ifdef USE_3DNOW_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/3dnow_xform2.S b/src/mesa/x86/3dnow_xform2.S
index 169a47f0866..fd71648e2c0 100644
--- a/src/mesa/x86/3dnow_xform2.S
+++ b/src/mesa/x86/3dnow_xform2.S
@@ -25,7 +25,8 @@
#ifdef USE_3DNOW_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/3dnow_xform3.S b/src/mesa/x86/3dnow_xform3.S
index 7b0189c4ffc..db24843463f 100644
--- a/src/mesa/x86/3dnow_xform3.S
+++ b/src/mesa/x86/3dnow_xform3.S
@@ -25,7 +25,8 @@
#ifdef USE_3DNOW_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/3dnow_xform4.S b/src/mesa/x86/3dnow_xform4.S
index ee845b34004..161aaa1a9b7 100644
--- a/src/mesa/x86/3dnow_xform4.S
+++ b/src/mesa/x86/3dnow_xform4.S
@@ -25,7 +25,8 @@
#ifdef USE_3DNOW_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index 1887bcaaff4..7b29416c7aa 100644
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -39,7 +39,6 @@
* in there will break the build on some platforms.
*/
-#include "matypes.h"
#include "assyntax.h"
#include "common_x86_features.h"
diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
deleted file mode 100644
index 441b5c6938d..00000000000
--- a/src/mesa/x86/gen_matypes.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2006 Brian Paul 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, sublicense,
- * 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 above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * 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 NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- * Gareth Hughes
- */
-
-/*
- * This generates an asm version of mtypes.h (called matypes.h), so that
- * Mesa's x86 assembly code can access the internal structures easily.
- * This will be particularly useful when developing new x86 asm code for
- * Mesa, including lighting, clipping, texture image conversion etc.
- */
-
-#include <stdio.h>
-#include <inttypes.h>
-
-#include "main/glheader.h"
-#include "main/mtypes.h"
-#include "tnl/t_context.h"
-
-
-#undef offsetof
-#define offsetof( type, member ) ((size_t) &((type *)0)->member)
-
-
-#define OFFSET_HEADER( x ) \
-do { \
- printf( "\n" ); \
- printf( "\n" ); \
- printf( "/* =====================================================" \
- "========\n" ); \
- printf( " * Offsets for " x "\n" ); \
- printf( " */\n" ); \
- printf( "\n" ); \
-} while (0)
-
-#define DEFINE_HEADER( x ) \
-do { \
- printf( "\n" ); \
- printf( "/*\n" ); \
- printf( " * Flags for " x "\n" ); \
- printf( " */\n" ); \
- printf( "\n" ); \
-} while (0)
-
-#ifdef ASM_OFFSETS
-
-/*
- * Format the asm output in a special way that we can manipulate
- * after the fact and turn into the final header for the target.
- */
-
-#define DEFINE_UL( s, ul ) \
- __asm__ __volatile__ ( "\n->" s " %0" : : "i" (ul) )
-
-#define DEFINE( s, d ) \
- DEFINE_UL( s, d )
-
-#define printf( x ) \
- __asm__ __volatile__ ( "\n->" x )
-
-#else
-
-#define DEFINE_UL( s, ul ) \
- printf( "#define %s\t%lu\n", s, (unsigned long) (ul) );
-
-#define DEFINE( s, d ) \
- printf( "#define %s\t0x%" PRIx64 "\n", s, (uint64_t) d );
-
-#endif
-
-#define OFFSET( s, t, m ) \
- DEFINE_UL( s, offsetof( t, m ) )
-
-#define SIZEOF( s, t ) \
- DEFINE_UL( s, sizeof(t) )
-
-
-
-int main( int argc, char **argv )
-{
- printf( "/*\n" );
- printf( " * This file is automatically generated from the Mesa internal type\n" );
- printf( " * definitions. Do not edit directly.\n" );
- printf( " */\n" );
- printf( "\n" );
- printf( "#ifndef __ASM_TYPES_H__\n" );
- printf( "#define __ASM_TYPES_H__\n" );
- printf( "\n" );
-
- /* GLvector4f offsets:
- */
- OFFSET_HEADER( "GLvector4f" );
-
- OFFSET( "V4F_DATA ", GLvector4f, data );
- OFFSET( "V4F_START ", GLvector4f, start );
- OFFSET( "V4F_COUNT ", GLvector4f, count );
- OFFSET( "V4F_STRIDE ", GLvector4f, stride );
- OFFSET( "V4F_SIZE ", GLvector4f, size );
- OFFSET( "V4F_FLAGS ", GLvector4f, flags );
-
- DEFINE_HEADER( "GLvector4f" );
-
- DEFINE( "VEC_SIZE_1 ", VEC_SIZE_1 );
- DEFINE( "VEC_SIZE_2 ", VEC_SIZE_2 );
- DEFINE( "VEC_SIZE_3 ", VEC_SIZE_3 );
- DEFINE( "VEC_SIZE_4 ", VEC_SIZE_4 );
-
-
- /* GLmatrix offsets:
- */
- OFFSET_HEADER( "GLmatrix" );
-
- OFFSET( "MATRIX_DATA ", GLmatrix, m );
- OFFSET( "MATRIX_INV ", GLmatrix, inv );
- OFFSET( "MATRIX_FLAGS ", GLmatrix, flags );
- OFFSET( "MATRIX_TYPE ", GLmatrix, type );
-
-
- printf( "\n" );
- printf( "\n" );
- printf( "#endif /* __ASM_TYPES_H__ */\n" );
-
- return 0;
-}
diff --git a/src/mesa/x86/mmx_blend.S b/src/mesa/x86/mmx_blend.S
index df736cdaa59..500e54a57f4 100644
--- a/src/mesa/x86/mmx_blend.S
+++ b/src/mesa/x86/mmx_blend.S
@@ -6,7 +6,8 @@
#ifdef USE_MMX_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
/* integer multiplication - alpha plus one
*
diff --git a/src/mesa/x86/sse_normal.S b/src/mesa/x86/sse_normal.S
index 36d69e0b0a1..279f6eafcad 100644
--- a/src/mesa/x86/sse_normal.S
+++ b/src/mesa/x86/sse_normal.S
@@ -32,7 +32,8 @@
#ifdef USE_SSE_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "norm_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/sse_xform1.S b/src/mesa/x86/sse_xform1.S
index 7d84a52bc3c..9473fc1571f 100644
--- a/src/mesa/x86/sse_xform1.S
+++ b/src/mesa/x86/sse_xform1.S
@@ -32,7 +32,8 @@
#ifdef USE_SSE_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/sse_xform2.S b/src/mesa/x86/sse_xform2.S
index 70215100d19..f89146b42d5 100644
--- a/src/mesa/x86/sse_xform2.S
+++ b/src/mesa/x86/sse_xform2.S
@@ -32,7 +32,8 @@
#ifdef USE_SSE_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/sse_xform3.S b/src/mesa/x86/sse_xform3.S
index aeb43ef7017..93387860389 100644
--- a/src/mesa/x86/sse_xform3.S
+++ b/src/mesa/x86/sse_xform3.S
@@ -32,7 +32,8 @@
#ifdef USE_SSE_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/sse_xform4.S b/src/mesa/x86/sse_xform4.S
index 0baa8ef8411..d81e9a5b9a1 100644
--- a/src/mesa/x86/sse_xform4.S
+++ b/src/mesa/x86/sse_xform4.S
@@ -25,7 +25,8 @@
#ifdef USE_SSE_ASM
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/x86_cliptest.S b/src/mesa/x86/x86_cliptest.S
index 031ec1d88ed..231c029e84f 100644
--- a/src/mesa/x86/x86_cliptest.S
+++ b/src/mesa/x86/x86_cliptest.S
@@ -30,7 +30,8 @@
*/
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "clip_args.h"
#define SRC0 REGOFF(0, ESI)
diff --git a/src/mesa/x86/x86_xform2.S b/src/mesa/x86/x86_xform2.S
index a36c3dcdab7..fb1b4bea572 100644
--- a/src/mesa/x86/x86_xform2.S
+++ b/src/mesa/x86/x86_xform2.S
@@ -30,7 +30,8 @@
*/
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/x86_xform3.S b/src/mesa/x86/x86_xform3.S
index 52783064e40..6d2d5185e4c 100644
--- a/src/mesa/x86/x86_xform3.S
+++ b/src/mesa/x86/x86_xform3.S
@@ -30,7 +30,8 @@
*/
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
diff --git a/src/mesa/x86/x86_xform4.S b/src/mesa/x86/x86_xform4.S
index e585968ed95..f6db5e3165b 100644
--- a/src/mesa/x86/x86_xform4.S
+++ b/src/mesa/x86/x86_xform4.S
@@ -30,7 +30,8 @@
*/
#include "assyntax.h"
-#include "matypes.h"
+#define MATH_ASM_PTR_SIZE 4
+#include "math/m_vector_asm.h"
#include "xform_args.h"
SEG_TEXT
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 10:28:37 +0000