Remove all traces of CULL_MASK_ACTIVE.

6 files changed, 135 insertions, 218 deletions

diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index 821a33d76cd..37346a8b7b3 100644
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,4 +1,4 @@
-/* $Id: 3dnow.c,v 1.18 2001/03/29 06:46:15 gareth Exp $ */
+/* $Id: 3dnow.c,v 1.19 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,92 +31,18 @@
 
 #include "glheader.h"
 #include "context.h"
-#include "mtypes.h"
-#include "3dnow.h"
-
 #include "math/m_vertices.h"
 #include "math/m_xform.h"
-
 #include "tnl/t_context.h"
 
+#include "3dnow.h"
+#include "common_x86_macros.h"
+
 #ifdef DEBUG
 #include "math/m_debug.h"
 #endif
 
 
-#define XFORM_ARGS	GLvector4f *to_vec,				\
-			const GLfloat m[16],				\
-			const GLvector4f *from_vec,			\
-			const GLubyte *mask,				\
-			const GLubyte flag
-
-
-#define DECLARE_XFORM_GROUP( pfx, sz ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
-
-
-#define ASSIGN_XFORM_GROUP( pfx, sz )					\
-   _mesa_transform_tab[0][sz][MATRIX_GENERAL] =				\
-      _mesa_##pfx##_transform_points##sz##_general;			\
-   _mesa_transform_tab[0][sz][MATRIX_IDENTITY] =			\
-      _mesa_##pfx##_transform_points##sz##_identity;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_PERSPECTIVE] =			\
-      _mesa_##pfx##_transform_points##sz##_perspective;			\
-   _mesa_transform_tab[0][sz][MATRIX_2D] =				\
-      _mesa_##pfx##_transform_points##sz##_2d;				\
-   _mesa_transform_tab[0][sz][MATRIX_2D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D] =				\
-      _mesa_##pfx##_transform_points##sz##_3d;
-
-
-
-#define NORM_ARGS	const GLmatrix *mat,				\
-			GLfloat scale,					\
-			const GLvector3f *in,				\
-			const GLfloat *lengths,				\
-			const GLubyte mask[],				\
-			GLvector3f *dest
-
-
-#define DECLARE_NORM_GROUP( pfx ) \
-extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
-extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
-
-
-#define ASSIGN_NORM_GROUP( pfx )					\
-   _mesa_normal_tab[NORM_RESCALE][0] =					\
-      _mesa_##pfx##_rescale_normals;					\
-   _mesa_normal_tab[NORM_NORMALIZE][0] =				\
-      _mesa_##pfx##_normalize_normals;					\
-   _mesa_normal_tab[NORM_TRANSFORM][0] =				\
-      _mesa_##pfx##_transform_normals;					\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT][0] =				\
-      _mesa_##pfx##_transform_normals_no_rot;				\
-   _mesa_normal_tab[NORM_TRANSFORM|NORM_RESCALE][0] =			\
-      _mesa_##pfx##_transform_rescale_normals;				\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT|NORM_RESCALE][0] =		\
-      _mesa_##pfx##_transform_rescale_normals_no_rot;			\
-   _mesa_normal_tab[NORM_TRANSFORM|NORM_NORMALIZE][0] =			\
-      _mesa_##pfx##_transform_normalize_normals;			\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT|NORM_NORMALIZE][0] =		\
-      _mesa_##pfx##_transform_normalize_normals_no_rot;
-
-
 #ifdef USE_3DNOW_ASM
 DECLARE_XFORM_GROUP( 3dnow, 2 )
 DECLARE_XFORM_GROUP( 3dnow, 3 )
diff --git a/src/mesa/x86/common_x86_macros.h b/src/mesa/x86/common_x86_macros.h
new file mode 100644
index 00000000000..34ef34d7dc6
--- /dev/null
+++ b/src/mesa/x86/common_x86_macros.h
@@ -0,0 +1,107 @@
+/* $Id: common_x86_macros.h,v 1.1 2001/03/30 14:44:43 gareth Exp $ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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
+ * BRIAN PAUL 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 <[email protected]>
+ */
+
+#ifndef __COMMON_X86_MACROS_H__
+#define __COMMON_X86_MACROS_H__
+
+
+/* =============================================================
+ * Transformation function declarations:
+ */
+
+#define XFORM_ARGS	GLvector4f *to_vec,				\
+			const GLfloat m[16],				\
+			const GLvector4f *from_vec
+
+#define DECLARE_XFORM_GROUP( pfx, sz ) \
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
+
+#define ASSIGN_XFORM_GROUP( pfx, sz )					\
+   _mesa_transform_tab[sz][MATRIX_GENERAL] =				\
+      _mesa_##pfx##_transform_points##sz##_general;			\
+   _mesa_transform_tab[sz][MATRIX_IDENTITY] =				\
+      _mesa_##pfx##_transform_points##sz##_identity;			\
+   _mesa_transform_tab[sz][MATRIX_3D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_PERSPECTIVE] =			\
+      _mesa_##pfx##_transform_points##sz##_perspective;			\
+   _mesa_transform_tab[sz][MATRIX_2D] =					\
+      _mesa_##pfx##_transform_points##sz##_2d;				\
+   _mesa_transform_tab[sz][MATRIX_2D_NO_ROT] =				\
+      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
+   _mesa_transform_tab[sz][MATRIX_3D] =					\
+      _mesa_##pfx##_transform_points##sz##_3d;
+
+
+/* =============================================================
+ * Normal transformation function declarations:
+ */
+
+#define NORM_ARGS	const GLmatrix *mat,				\
+			GLfloat scale,					\
+			const GLvector3f *in,				\
+			const GLfloat *lengths,				\
+			GLvector3f *dest
+
+#define DECLARE_NORM_GROUP( pfx ) \
+extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
+extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
+extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\
+extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
+extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
+
+#define ASSIGN_NORM_GROUP( pfx )					\
+   _mesa_normal_tab[NORM_RESCALE] =					\
+      _mesa_##pfx##_rescale_normals;					\
+   _mesa_normal_tab[NORM_NORMALIZE] =					\
+      _mesa_##pfx##_normalize_normals;					\
+   _mesa_normal_tab[NORM_TRANSFORM] =					\
+      _mesa_##pfx##_transform_normals;					\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =				\
+      _mesa_##pfx##_transform_normals_no_rot;				\
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =			\
+      _mesa_##pfx##_transform_rescale_normals;				\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =		\
+      _mesa_##pfx##_transform_rescale_normals_no_rot;			\
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE] =			\
+      _mesa_##pfx##_transform_normalize_normals;			\
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE] =		\
+      _mesa_##pfx##_transform_normalize_normals_no_rot;
+
+
+#endif
diff --git a/src/mesa/x86/norm_args.h b/src/mesa/x86/norm_args.h
index b3d592221f6..d38b061965e 100644
--- a/src/mesa/x86/norm_args.h
+++ b/src/mesa/x86/norm_args.h
@@ -1,4 +1,4 @@
-/* $Id: norm_args.h,v 1.1 2001/03/28 20:44:44 gareth Exp $ */
+/* $Id: norm_args.h,v 1.2 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -41,21 +41,18 @@
  *                              GLfloat scale,
  *                              CONST GLvector3f *in,
  *                              CONST GLfloat lengths[],
- *                              CONST GLubyte mask[],
  *                              GLvector3f *dest );
  */
 #define OFFSET_MAT	4
 #define OFFSET_SCALE	8
 #define OFFSET_IN	12
 #define OFFSET_LENGTHS	16
-#define OFFSET_MASK	20
-#define OFFSET_DEST	24
+#define OFFSET_DEST	20
 
 #define ARG_MAT         REGOFF(FRAME_OFFSET+OFFSET_MAT, ESP)
 #define ARG_SCALE       REGOFF(FRAME_OFFSET+OFFSET_SCALE, ESP)
 #define ARG_IN          REGOFF(FRAME_OFFSET+OFFSET_IN, ESP)
 #define ARG_LENGTHS     REGOFF(FRAME_OFFSET+OFFSET_LENGTHS, ESP)
-#define ARG_MASK        REGOFF(FRAME_OFFSET+OFFSET_MASK, ESP)
 #define ARG_DEST        REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)
 
 #endif
diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index a986636edc7..bcabf5ca1da 100644
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -1,4 +1,4 @@
-/* $Id: sse.c,v 1.1 2001/03/29 06:46:16 gareth Exp $ */
+/* $Id: sse.c,v 1.2 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,92 +31,18 @@
 
 #include "glheader.h"
 #include "context.h"
-#include "mtypes.h"
-#include "sse.h"
-
 #include "math/m_vertices.h"
 #include "math/m_xform.h"
-
 #include "tnl/t_context.h"
 
+#include "sse.h"
+#include "common_x86_macros.h"
+
 #ifdef DEBUG
 #include "math/m_debug.h"
 #endif
 
 
-#define XFORM_ARGS	GLvector4f *to_vec,				\
-			const GLfloat m[16],				\
-			const GLvector4f *from_vec,			\
-			const GLubyte *mask,				\
-			const GLubyte flag
-
-
-#define DECLARE_XFORM_GROUP( pfx, sz ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
-
-
-#define ASSIGN_XFORM_GROUP( pfx, sz )					\
-   _mesa_transform_tab[0][sz][MATRIX_GENERAL] =				\
-      _mesa_##pfx##_transform_points##sz##_general;			\
-   _mesa_transform_tab[0][sz][MATRIX_IDENTITY] =			\
-      _mesa_##pfx##_transform_points##sz##_identity;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_PERSPECTIVE] =			\
-      _mesa_##pfx##_transform_points##sz##_perspective;			\
-   _mesa_transform_tab[0][sz][MATRIX_2D] =				\
-      _mesa_##pfx##_transform_points##sz##_2d;				\
-   _mesa_transform_tab[0][sz][MATRIX_2D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D] =				\
-      _mesa_##pfx##_transform_points##sz##_3d;
-
-
-
-#define NORM_ARGS	const GLmatrix *mat,				\
-			GLfloat scale,					\
-			const GLvector3f *in,				\
-			const GLfloat *lengths,				\
-			const GLubyte mask[],				\
-			GLvector3f *dest
-
-
-#define DECLARE_NORM_GROUP( pfx ) \
-extern void _ASMAPI _mesa_##pfx##_rescale_normals( NORM_ARGS );				\
-extern void _ASMAPI _mesa_##pfx##_normalize_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals( NORM_ARGS );			\
-extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot( NORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals( NORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot( NORM_ARGS );
-
-
-#define ASSIGN_NORM_GROUP( pfx )					\
-   _mesa_normal_tab[NORM_RESCALE][0] =					\
-      _mesa_##pfx##_rescale_normals;					\
-   _mesa_normal_tab[NORM_NORMALIZE][0] =				\
-      _mesa_##pfx##_normalize_normals;					\
-   _mesa_normal_tab[NORM_TRANSFORM][0] =				\
-      _mesa_##pfx##_transform_normals;					\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT][0] =				\
-      _mesa_##pfx##_transform_normals_no_rot;				\
-   _mesa_normal_tab[NORM_TRANSFORM|NORM_RESCALE][0] =			\
-      _mesa_##pfx##_transform_rescale_normals;				\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT|NORM_RESCALE][0] =		\
-      _mesa_##pfx##_transform_rescale_normals_no_rot;			\
-   _mesa_normal_tab[NORM_TRANSFORM|NORM_NORMALIZE][0] =			\
-      _mesa_##pfx##_transform_normalize_normals;			\
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT|NORM_NORMALIZE][0] =		\
-      _mesa_##pfx##_transform_normalize_normals_no_rot;
-
-
 #ifdef USE_SSE_ASM
 DECLARE_XFORM_GROUP( sse, 2 )
 DECLARE_XFORM_GROUP( sse, 3 )
@@ -166,20 +92,22 @@ void _mesa_init_sse_transform_asm( void )
 #if 1
    /* TODO: Finish these off.
     */
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT][0] =
-      _mesa_sse_transform_normals_no_rot;
-   _mesa_normal_tab[NORM_TRANSFORM|NORM_RESCALE][0] =
-      _mesa_sse_transform_rescale_normals;
-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT|NORM_RESCALE][0] =
-      _mesa_sse_transform_rescale_normals_no_rot;
-
-   _mesa_transform_tab[0][4][MATRIX_GENERAL] =
+   _mesa_transform_tab[4][MATRIX_GENERAL] =
       _mesa_sse_transform_points4_general;
-   _mesa_transform_tab[0][4][MATRIX_3D] =
+   _mesa_transform_tab[4][MATRIX_3D] =
       _mesa_sse_transform_points4_3d;
-   _mesa_transform_tab[0][4][MATRIX_IDENTITY] =
+   _mesa_transform_tab[4][MATRIX_IDENTITY] =
       _mesa_sse_transform_points4_identity;
+
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
+      _mesa_sse_transform_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals_no_rot;
 #else
+   ASSIGN_XFORM_GROUP( sse, 4 );
+
    ASSIGN_NORM_GROUP( sse );
 #endif
 
diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index a51f181916d..ddcfe86a752 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,4 +1,4 @@
-/* $Id: x86.c,v 1.20 2001/03/29 06:46:27 gareth Exp $ */
+/* $Id: x86.c,v 1.21 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,53 +30,18 @@
 
 #include "glheader.h"
 #include "context.h"
-#include "mtypes.h"
-#include "x86.h"
-
 #include "math/m_vertices.h"
 #include "math/m_xform.h"
-
 #include "tnl/t_context.h"
 
+#include "x86.h"
+#include "common_x86_macros.h"
+
 #ifdef DEBUG
 #include "math/m_debug.h"
 #endif
 
 
-#define XFORM_ARGS 	GLvector4f *to_vec, 				\
-			const GLfloat m[16], 				\
-			const GLvector4f *from_vec, 			\
-			const GLubyte *mask, 				\
-			const GLubyte flag
-
-
-#define DECLARE_XFORM_GROUP( pfx, sz ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d( XFORM_ARGS );		\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot( XFORM_ARGS );	\
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d( XFORM_ARGS );
-
-
-#define ASSIGN_XFORM_GROUP( pfx, sz )					\
-   _mesa_transform_tab[0][sz][MATRIX_GENERAL] =				\
-      _mesa_##pfx##_transform_points##sz##_general;			\
-   _mesa_transform_tab[0][sz][MATRIX_IDENTITY] =			\
-      _mesa_##pfx##_transform_points##sz##_identity;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_3d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_PERSPECTIVE] =			\
-      _mesa_##pfx##_transform_points##sz##_perspective;			\
-   _mesa_transform_tab[0][sz][MATRIX_2D] =				\
-      _mesa_##pfx##_transform_points##sz##_2d;				\
-   _mesa_transform_tab[0][sz][MATRIX_2D_NO_ROT] =			\
-      _mesa_##pfx##_transform_points##sz##_2d_no_rot;			\
-   _mesa_transform_tab[0][sz][MATRIX_3D] =				\
-      _mesa_##pfx##_transform_points##sz##_3d;
-
-
 #ifdef USE_X86_ASM
 DECLARE_XFORM_GROUP( x86, 2 )
 DECLARE_XFORM_GROUP( x86, 3 )
diff --git a/src/mesa/x86/xform_args.h b/src/mesa/x86/xform_args.h
index de3ce6855f7..c5060a23b92 100644
--- a/src/mesa/x86/xform_args.h
+++ b/src/mesa/x86/xform_args.h
@@ -1,4 +1,4 @@
-/* $Id: xform_args.h,v 1.3 2001/03/28 20:44:44 gareth Exp $ */
+/* $Id: xform_args.h,v 1.4 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -39,20 +39,14 @@
  *
  * typedef void (*transform_func)( GLvector4f *to_vec,
  *				   const GLfloat m[16],
- *				   const GLvector4f *from_vec,
- *				   const GLubyte *clipmask,
- *				   const GLubyte flag );
+ *				   const GLvector4f *from_vec );
  */
 #define OFFSET_DEST	4
 #define OFFSET_MATRIX	8
 #define OFFSET_SOURCE	12
-#define OFFSET_CLIP	16
-#define OFFSET_FLAG	20
 
 #define ARG_DEST	REGOFF(FRAME_OFFSET+OFFSET_DEST, ESP)
 #define ARG_MATRIX 	REGOFF(FRAME_OFFSET+OFFSET_MATRIX, ESP)
 #define ARG_SOURCE 	REGOFF(FRAME_OFFSET+OFFSET_SOURCE, ESP)
-#define ARG_CLIP 	REGOFF(FRAME_OFFSET+OFFSET_CLIP, ESP)
-#define ARG_FLAG 	REGOFF(FRAME_OFFSET+OFFSET_FLAG, ESP)
 
 #endif