-/* $Id: x86.c,v 1.19 2001/03/28 20:44:44 gareth Exp $ */
+/* $Id: x86.c,v 1.25 2002/04/09 14:58:03 keithw Exp $ */
/*
* Mesa 3-D graphics library
#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, masked ) \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS ); \
-extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS );
-
-
-#define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked ) \
- _mesa_transform_tab[cma][sz][MATRIX_GENERAL] = \
- _mesa_##pfx##_transform_points##sz##_general_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_IDENTITY] = \
- _mesa_##pfx##_transform_points##sz##_identity_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \
- _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \
- _mesa_##pfx##_transform_points##sz##_perspective_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_2D] = \
- _mesa_##pfx##_transform_points##sz##_2d_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \
- _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked; \
- _mesa_transform_tab[cma][sz][MATRIX_3D] = \
- _mesa_##pfx##_transform_points##sz##_3d_##masked;
-
-
#ifdef USE_X86_ASM
-DECLARE_XFORM_GROUP( x86, 2, raw )
-DECLARE_XFORM_GROUP( x86, 3, raw )
-DECLARE_XFORM_GROUP( x86, 4, raw )
-DECLARE_XFORM_GROUP( x86, 2, masked )
-DECLARE_XFORM_GROUP( x86, 3, masked )
-DECLARE_XFORM_GROUP( x86, 4, masked )
+DECLARE_XFORM_GROUP( x86, 2 )
+DECLARE_XFORM_GROUP( x86, 3 )
+DECLARE_XFORM_GROUP( x86, 4 )
extern GLvector4f * _ASMAPI
void _mesa_init_x86_transform_asm( void )
{
#ifdef USE_X86_ASM
- ASSIGN_XFORM_GROUP( x86, 0, 2, raw );
- ASSIGN_XFORM_GROUP( x86, 0, 3, raw );
- ASSIGN_XFORM_GROUP( x86, 0, 4, raw );
-
-/* ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 2, masked ); */
-/* ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 3, masked ); */
-/* ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked ); */
+ ASSIGN_XFORM_GROUP( x86, 2 );
+ ASSIGN_XFORM_GROUP( x86, 3 );
+ ASSIGN_XFORM_GROUP( x86, 4 );
- /* XXX this function has been found to cause FP overflow exceptions */
_mesa_clip_tab[4] = _mesa_x86_cliptest_points4;
_mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;
#ifdef DEBUG
_math_test_all_transform_functions( "x86" );
+ _math_test_all_cliptest_functions( "x86" );
#endif
#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;
-
-#ifdef DEBUG
- _math_test_all_vertex_functions( "x86" );
-#endif
-#endif
-}