simplify test for specific texture formats
[mesa.git] / src / mesa / x86 / x86.c
index b49965f6b3323a099d02c1ebab8a6d9f04160a18..4f35a2ffc50edf27cdfa8c203c0e2bb39bfa907e 100644 (file)
@@ -1,10 +1,10 @@
-/* $Id: x86.c,v 1.15 2001/01/13 05:48:25 keithw Exp $ */
+/* $Id: x86.c,v 1.19 2001/03/28 20:44:44 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * 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"),
@@ -39,7 +39,7 @@
 #include "tnl/t_context.h"
 
 #ifdef DEBUG
-#include "math/m_debug_xform.h"
+#include "math/m_debug.h"
 #endif
 
 
 
 
 #define DECLARE_XFORM_GROUP( pfx, sz, masked ) \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS );     \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS );            \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS );    \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS );  \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS );          \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS );    \
- extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS );
+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 )                     \
-   gl_transform_tab[cma][sz][MATRIX_GENERAL] =                         \
-      gl_##pfx##_transform_points##sz##_general_##masked;              \
-   gl_transform_tab[cma][sz][MATRIX_IDENTITY] =                                \
-      gl_##pfx##_transform_points##sz##_identity_##masked;             \
-   gl_transform_tab[cma][sz][MATRIX_3D_NO_ROT] =                       \
-      gl_##pfx##_transform_points##sz##_3d_no_rot_##masked;            \
-   gl_transform_tab[cma][sz][MATRIX_PERSPECTIVE] =                     \
-      gl_##pfx##_transform_points##sz##_perspective_##masked;          \
-   gl_transform_tab[cma][sz][MATRIX_2D] =                              \
-      gl_##pfx##_transform_points##sz##_2d_##masked;                   \
-   gl_transform_tab[cma][sz][MATRIX_2D_NO_ROT] =                       \
-      gl_##pfx##_transform_points##sz##_2d_no_rot_##masked;            \
-   gl_transform_tab[cma][sz][MATRIX_3D] =                              \
-      gl_##pfx##_transform_points##sz##_3d_##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
@@ -86,36 +86,37 @@ DECLARE_XFORM_GROUP( x86, 3, masked )
 DECLARE_XFORM_GROUP( x86, 4, masked )
 
 
-extern GLvector4f * _ASMAPI gl_x86_cliptest_points4( GLvector4f *clip_vec,
-                                                    GLvector4f *proj_vec,
-                                                    GLubyte clipMask[],
-                                                    GLubyte *orMask,
-                                                    GLubyte *andMask );
-
-
-extern GLvector4f * _ASMAPI gl_x86_cliptest_points4_np( GLvector4f *clip_vec,
-                                                       GLvector4f *proj_vec,
-                                                       GLubyte clipMask[],
-                                                       GLubyte *orMask,
-                                                       GLubyte *andMask );
-
-
-extern void _ASMAPI gl_v16_x86_cliptest_points4( GLfloat *first_vert,
-                                                GLfloat *last_vert,
-                                                GLubyte *or_mask,
-                                                GLubyte *and_mask,
-                                                GLubyte *clip_mask );
-
-
-extern void _ASMAPI gl_v16_x86_general_xform( GLfloat *dest,
-                                             const GLfloat *m,
-                                             const GLfloat *src,
-                                             GLuint src_stride,
-                                             GLuint count );
+extern GLvector4f * _ASMAPI
+_mesa_x86_cliptest_points4( GLvector4f *clip_vec,
+                           GLvector4f *proj_vec,
+                           GLubyte clipMask[],
+                           GLubyte *orMask,
+                           GLubyte *andMask );
+
+extern GLvector4f * _ASMAPI
+_mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
+                              GLvector4f *proj_vec,
+                              GLubyte clipMask[],
+                              GLubyte *orMask,
+                              GLubyte *andMask );
+
+extern void _ASMAPI
+_mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
+                               GLfloat *last_vert,
+                               GLubyte *or_mask,
+                               GLubyte *and_mask,
+                               GLubyte *clip_mask );
+
+extern void _ASMAPI
+_mesa_v16_x86_general_xform( GLfloat *dest,
+                            const GLfloat *m,
+                            const GLfloat *src,
+                            GLuint src_stride,
+                            GLuint count );
 #endif
 
 
-void gl_init_x86_transform_asm( void )
+void _mesa_init_x86_transform_asm( void )
 {
 #ifdef USE_X86_ASM
    ASSIGN_XFORM_GROUP( x86, 0, 2, raw );
@@ -127,23 +128,23 @@ void gl_init_x86_transform_asm( void )
 /*     ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked ); */
 
    /* XXX this function has been found to cause FP overflow exceptions */
-   gl_clip_tab[4] = gl_x86_cliptest_points4;
-   gl_clip_np_tab[4] = gl_x86_cliptest_points4_np;
+   _mesa_clip_tab[4] = _mesa_x86_cliptest_points4;
+   _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;
 
 #ifdef DEBUG
-   gl_test_all_transform_functions( "x86" );
+   _math_test_all_transform_functions( "x86" );
 #endif
 #endif
 }
 
-void gl_init_x86_vertex_asm( void )
+void _mesa_init_x86_vertex_asm( void )
 {
 #ifdef USE_X86_ASM
-   gl_xform_points3_v16_general        = gl_v16_x86_general_xform;
-   gl_cliptest_points4_v16     = gl_v16_x86_cliptest_points4;
+   _mesa_xform_points3_v16_general = _mesa_v16_x86_general_xform;
+   _mesa_cliptest_points4_v16 = _mesa_v16_x86_cliptest_points4;
 
-#ifdef DEBUG_NOT
-   gl_test_all_vertex_functions( "x86" );
+#ifdef DEBUG
+   _math_test_all_vertex_functions( "x86" );
 #endif
 #endif
 }