Merge branch '7.8'

[mesa.git] / src / mesa / x86 / x86_xform.c

diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c
index c2df5e31e6e82bbaaf5502163b522a90d9287a64..c834e2b468b8b26b4e7c86b5e00978f8de01cdea 100644 (file)
--- a/src/mesa/x86/x86_xform.c
+++ b/src/mesa/x86/x86_xform.c
@@ -30,12 +30,19 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "math/m_xform.h"
-#include "tnl/t_context.h"
 
-#include "x86.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 #include "common_x86_asm.h"
 
+#ifdef USE_X86_ASM
+#ifdef USE_3DNOW_ASM
+#include "3dnow.h"
+#endif
+#ifdef USE_SSE_ASM
+#include "sse.h"
+#endif
+#endif
+
 #ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
@@ -52,21 +59,24 @@ _mesa_x86_cliptest_points4( GLvector4f *clip_vec,
                            GLvector4f *proj_vec,
                            GLubyte clipMask[],
                            GLubyte *orMask,
-                           GLubyte *andMask );
+                           GLubyte *andMask,
+                           GLboolean viewport_z_clip );
 
 extern GLvector4f * _ASMAPI
 _mesa_x86_cliptest_points4_np( GLvector4f *clip_vec,
                               GLvector4f *proj_vec,
                               GLubyte clipMask[],
                               GLubyte *orMask,
-                              GLubyte *andMask );
+                              GLubyte *andMask,
+                              GLboolean viewport_z_clip );
 
 extern void _ASMAPI
 _mesa_v16_x86_cliptest_points4( GLfloat *first_vert,
                                GLfloat *last_vert,
                                GLubyte *or_mask,
                                GLubyte *and_mask,
-                               GLubyte *clip_mask );
+                               GLubyte *clip_mask,
+                               GLboolean viewport_z_clip );
 
 extern void _ASMAPI
 _mesa_v16_x86_general_xform( GLfloat *dest,
@@ -77,9 +87,9 @@ _mesa_v16_x86_general_xform( GLfloat *dest,
 #endif
 
 
-void _mesa_init_x86_transform_asm( void )
-{
 #ifdef USE_X86_ASM
+static void _mesa_init_x86_transform_asm( void )
+{
    ASSIGN_XFORM_GROUP( x86, 2 );
    ASSIGN_XFORM_GROUP( x86, 3 );
    ASSIGN_XFORM_GROUP( x86, 4 );
@@ -91,8 +101,8 @@ void _mesa_init_x86_transform_asm( void )
    _math_test_all_transform_functions( "x86" );
    _math_test_all_cliptest_functions( "x86" );
 #endif
-#endif
 }
+#endif
 
 
 void _mesa_init_all_x86_transform_asm( void )