X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fx86%2Fx86_xform.c;h=c834e2b468b8b26b4e7c86b5e00978f8de01cdea;hb=ee30e24f5f9cc2ec6c5a3edbe498e5e0334f788b;hp=9574ee5e1fdeabab4bf2ec5867f092c7fc6d2fc6;hpb=8538f64d0929715cb22a44186598471342c258c6;p=mesa.git

diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c
index 9574ee5e1fd..c834e2b468b 100644
--- 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 "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
 
 
+#ifdef USE_X86_ASM
 static void _mesa_init_x86_transform_asm( void )
 {
-#ifdef USE_X86_ASM
    ASSIGN_XFORM_GROUP( x86, 2 );
    ASSIGN_XFORM_GROUP( x86, 3 );
    ASSIGN_XFORM_GROUP( x86, 4 );
@@ -91,8 +101,8 @@ static 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 )