summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/Makefile.X114
-rw-r--r--src/mesa/main/Makefile.X114
-rw-r--r--src/mesa/main/context.c3
-rw-r--r--src/mesa/math/m_norm_tmp.h3
-rw-r--r--src/mesa/math/m_xform.c3
-rw-r--r--src/mesa/sparc/sparc.c3
-rw-r--r--src/mesa/x86/3dnow.c15
-rw-r--r--src/mesa/x86/3dnow.h3
-rw-r--r--src/mesa/x86/common_x86.c25
-rw-r--r--src/mesa/x86/common_x86_asm.h3
-rw-r--r--src/mesa/x86/sse.c19
-rw-r--r--src/mesa/x86/sse.h3
-rw-r--r--src/mesa/x86/x86.c14
-rw-r--r--src/mesa/x86/x86.h3
14 files changed, 14 insertions, 91 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 57815ae9f1..8ab3a30849 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.66 2002/04/02 16:20:00 brianp Exp $
+# $Id: Makefile.X11,v 1.67 2002/04/09 14:58:03 keithw Exp $
# Mesa 3-D graphics library
# Version: 4.1
@@ -81,13 +81,11 @@ CORE_SOURCES = \
X86/sse.c \
math/m_debug_clip.c \
math/m_debug_norm.c \
- math/m_debug_vertex.c \
math/m_debug_xform.c \
math/m_eval.c \
math/m_matrix.c \
math/m_translate.c \
math/m_vector.c \
- math/m_vertices.c \
math/m_xform.c \
array_cache/ac_context.c \
array_cache/ac_import.c \
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 57815ae9f1..8ab3a30849 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.66 2002/04/02 16:20:00 brianp Exp $
+# $Id: Makefile.X11,v 1.67 2002/04/09 14:58:03 keithw Exp $
# Mesa 3-D graphics library
# Version: 4.1
@@ -81,13 +81,11 @@ CORE_SOURCES = \
X86/sse.c \
math/m_debug_clip.c \
math/m_debug_norm.c \
- math/m_debug_vertex.c \
math/m_debug_xform.c \
math/m_eval.c \
math/m_matrix.c \
math/m_translate.c \
math/m_vector.c \
- math/m_vertices.c \
math/m_xform.c \
array_cache/ac_context.c \
array_cache/ac_import.c \
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index fa86aaef97..969b320a44 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.158 2002/03/29 17:27:59 brianp Exp $ */
+/* $Id: context.c,v 1.159 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -55,7 +55,6 @@
#include "vpstate.h"
#include "vtxfmt.h"
#include "math/m_translate.h"
-#include "math/m_vertices.h"
#include "math/m_matrix.h"
#include "math/m_xform.h"
#include "math/mathmod.h"
diff --git a/src/mesa/math/m_norm_tmp.h b/src/mesa/math/m_norm_tmp.h
index 767d1feddf..7c8ec180c2 100644
--- a/src/mesa/math/m_norm_tmp.h
+++ b/src/mesa/math/m_norm_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_norm_tmp.h,v 1.10 2002/01/05 20:51:12 brianp Exp $ */
+/* $Id: m_norm_tmp.h,v 1.11 2002/04/09 14:58:04 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -33,7 +33,6 @@
*/
#include <math.h>
-#include "m_vertices.h"
/*
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index c043b09069..8875594868 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -1,4 +1,4 @@
-/* $Id: m_xform.c,v 1.14 2001/05/23 14:27:03 brianp Exp $ */
+/* $Id: m_xform.c,v 1.15 2002/04/09 14:58:04 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -220,6 +220,5 @@ _math_init( void )
{
_math_init_transformation();
_math_init_translate();
- _math_init_vertices();
_math_init_eval();
}
diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c
index 69e4463c2a..d39751dbd0 100644
--- a/src/mesa/sparc/sparc.c
+++ b/src/mesa/sparc/sparc.c
@@ -1,4 +1,4 @@
-/* $Id: sparc.c,v 1.5 2001/06/06 22:55:28 davem69 Exp $ */
+/* $Id: sparc.c,v 1.6 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -30,7 +30,6 @@
#include "context.h"
-#include "math/m_vertices.h"
#include "math/m_xform.h"
#include "tnl/t_context.h"
#include "sparc.h"
diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index 79fe87985d..2742de6616 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.20 2001/11/19 13:52:41 keithw Exp $ */
+/* $Id: 3dnow.c,v 1.21 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -31,7 +31,6 @@
#include "glheader.h"
#include "context.h"
-#include "math/m_vertices.h"
#include "math/m_xform.h"
#include "tnl/t_context.h"
@@ -91,16 +90,4 @@ void _mesa_init_3dnow_transform_asm( void )
#endif
}
-void _mesa_init_3dnow_vertex_asm( void )
-{
-#ifdef USE_3DNOW_ASM
- _mesa_xform_points3_v16_general = _mesa_v16_3dnow_general_xform;
-
- _mesa_project_v16 = _mesa_3dnow_project_vertices;
- _mesa_project_clipped_v16 = _mesa_3dnow_project_clipped_vertices;
-#ifdef DEBUG_NOT
- _math_test_all_vertex_functions( "3DNow!" );
-#endif
-#endif
-}
diff --git a/src/mesa/x86/3dnow.h b/src/mesa/x86/3dnow.h
index de7c6d8f6b..1f2fd8e8b4 100644
--- a/src/mesa/x86/3dnow.h
+++ b/src/mesa/x86/3dnow.h
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.h,v 1.5 2001/03/28 20:44:43 gareth Exp $ */
+/* $Id: 3dnow.h,v 1.6 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -35,6 +35,5 @@
#include "math/m_xform.h"
void _mesa_init_3dnow_transform_asm( void );
-void _mesa_init_3dnow_vertex_asm( void );
#endif
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index ba3a54ca4b..30d70d233c 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -1,4 +1,4 @@
-/* $Id: common_x86.c,v 1.16 2001/06/06 18:12:35 brianp Exp $ */
+/* $Id: common_x86.c,v 1.17 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -273,26 +273,3 @@ void _mesa_init_all_x86_transform_asm( void )
#endif
}
-/* Note: the above function must be called before this one, so that
- * _mesa_x86_cpu_features gets correctly initialized.
- */
-void _mesa_init_all_x86_vertex_asm( void )
-{
-#ifdef USE_X86_ASM
- if ( _mesa_x86_cpu_features ) {
- _mesa_init_x86_vertex_asm();
- }
-
-#ifdef USE_3DNOW_ASM
- if ( cpu_has_3dnow && getenv( "MESA_NO_3DNOW" ) == 0 ) {
- _mesa_init_3dnow_vertex_asm();
- }
-#endif
-
-#ifdef USE_SSE_ASM
- if ( cpu_has_xmm && getenv( "MESA_NO_SSE" ) == 0 ) {
- _mesa_init_sse_vertex_asm();
- }
-#endif
-#endif
-}
diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h
index ba965e6c08..c5c2667e51 100644
--- a/src/mesa/x86/common_x86_asm.h
+++ b/src/mesa/x86/common_x86_asm.h
@@ -1,4 +1,4 @@
-/* $Id: common_x86_asm.h,v 1.8 2001/03/29 06:46:16 gareth Exp $ */
+/* $Id: common_x86_asm.h,v 1.9 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -60,6 +60,5 @@
extern int _mesa_x86_cpu_features;
extern void _mesa_init_all_x86_transform_asm( void );
-extern void _mesa_init_all_x86_vertex_asm( void );
#endif
diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index bcabf5ca1d..8e995c80c3 100644
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -1,4 +1,4 @@
-/* $Id: sse.c,v 1.2 2001/03/30 14:44:43 gareth Exp $ */
+/* $Id: sse.c,v 1.3 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -31,7 +31,6 @@
#include "glheader.h"
#include "context.h"
-#include "math/m_vertices.h"
#include "math/m_xform.h"
#include "tnl/t_context.h"
@@ -118,19 +117,3 @@ void _mesa_init_sse_transform_asm( void )
#endif
}
-void _mesa_init_sse_vertex_asm( void )
-{
-#ifdef USE_SSE_ASM
- _mesa_xform_points3_v16_general = _mesa_v16_sse_general_xform;
-#if 0
- /* GH: These are broken. I'm fixing them now.
- */
- _mesa_project_v16 = _mesa_sse_project_vertices;
- _mesa_project_clipped_v16 = _mesa_sse_project_clipped_vertices;
-#endif
-
-#ifdef DEBUG_NOT
- _math_test_all_vertex_functions( "SSE" );
-#endif
-#endif
-}
diff --git a/src/mesa/x86/sse.h b/src/mesa/x86/sse.h
index 3ed1a95892..98146a9047 100644
--- a/src/mesa/x86/sse.h
+++ b/src/mesa/x86/sse.h
@@ -1,4 +1,4 @@
-/* $Id: sse.h,v 1.1 2001/03/29 06:46:16 gareth Exp $ */
+/* $Id: sse.h,v 1.2 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -35,6 +35,5 @@
#include "math/m_xform.h"
void _mesa_init_sse_transform_asm( void );
-void _mesa_init_sse_vertex_asm( void );
#endif
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index 9d71fe4314..16586b9727 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.24 2001/05/31 23:06:01 brianp Exp $ */
+/* $Id: x86.c,v 1.25 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -30,7 +30,6 @@
#include "glheader.h"
#include "context.h"
-#include "math/m_vertices.h"
#include "math/m_xform.h"
#include "tnl/t_context.h"
@@ -95,14 +94,3 @@ void _mesa_init_x86_transform_asm( void )
#endif
}
-void _mesa_init_x86_vertex_asm( void )
-{
-#ifdef USE_X86_ASM
- _mesa_xform_points3_v16_general = _mesa_v16_x86_general_xform;
- _mesa_cliptest_points4_v16 = _mesa_v16_x86_cliptest_points4;
-
-#if 0 /* DEBUG */
- _math_test_all_vertex_functions( "x86" );
-#endif
-#endif
-}
diff --git a/src/mesa/x86/x86.h b/src/mesa/x86/x86.h
index b614780bfc..a646aff46b 100644
--- a/src/mesa/x86/x86.h
+++ b/src/mesa/x86/x86.h
@@ -1,4 +1,4 @@
-/* $Id: x86.h,v 1.4 2001/03/28 20:44:44 gareth Exp $ */
+/* $Id: x86.h,v 1.5 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -32,6 +32,5 @@
#define __X86_H__
extern void _mesa_init_x86_transform_asm( void );
-extern void _mesa_init_x86_vertex_asm( void );
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 21:39:17 +0000