mesa: move _mesa_valid_to_render() to api_validate.c

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

diff --git a/src/mesa/x86/sse.c b/src/mesa/x86/sse.c
index 2b824e4c0103d130ec3d7754885ab48df1d73896..02fe18fa14d93d5061eab82912b1231fb9fec15a 100644 (file)
--- a/src/mesa/x86/sse.c
+++ b/src/mesa/x86/sse.c
@@ -1,10 +1,7 @@
-/* $Id: sse.c,v 1.4 2003/10/21 23:53:34 kendallb Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -19,9 +16,10 @@
  * 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 /*
@@ -29,15 +27,15 @@
  * Andre Werthmann <wertmann@cs.uni-potsdam.de>
  */
 
-#include "glheader.h"
-#include "context.h"
+#include "main/glheader.h"
+#include "main/context.h"
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
 
 #include "sse.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -48,32 +46,35 @@ DECLARE_XFORM_GROUP( sse, 3 )
 
 #if 1
 /* Some functions are not written in SSE-assembly, because the fpu ones are faster */
-extern void _ASMAPI _mesa_sse_transform_normals_no_rot( NORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_rescale_normals( NORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );
-
-extern void _ASMAPI _mesa_sse_transform_points4_general( XFORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_points4_3d( XFORM_ARGS );
-extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );
+extern void _mesa_sse_transform_normals_no_rot( NORM_ARGS );
+extern void _mesa_sse_transform_rescale_normals( NORM_ARGS );
+extern void _mesa_sse_transform_rescale_normals_no_rot( NORM_ARGS );
+
+extern void _mesa_sse_transform_points4_general( XFORM_ARGS );
+extern void _mesa_sse_transform_points4_3d( XFORM_ARGS );
+/* XXX this function segfaults, see below */
+extern void _mesa_sse_transform_points4_identity( XFORM_ARGS );
+/* XXX this one works, see below */
+extern void _mesa_x86_transform_points4_identity( XFORM_ARGS );
 #else
 DECLARE_NORM_GROUP( sse )
 #endif
 
 
-extern void _ASMAPI
+extern void
 _mesa_v16_sse_general_xform( GLfloat *first_vert,
                             const GLfloat *m,
                             const GLfloat *src,
                             GLuint src_stride,
                             GLuint count );
 
-extern void _ASMAPI
+extern void
 _mesa_sse_project_vertices( GLfloat *first,
                            GLfloat *last,
                            const GLfloat *m,
                            GLuint stride );
 
-extern void _ASMAPI
+extern void
 _mesa_sse_project_clipped_vertices( GLfloat *first,
                                    GLfloat *last,
                                    const GLfloat *m,
@@ -95,8 +96,11 @@ void _mesa_init_sse_transform_asm( void )
       _mesa_sse_transform_points4_general;
    _mesa_transform_tab[4][MATRIX_3D] =
       _mesa_sse_transform_points4_3d;
+   /* XXX NOTE: _mesa_sse_transform_points4_identity segfaults with the
+      conformance tests, so use the x86 version.
+   */
    _mesa_transform_tab[4][MATRIX_IDENTITY] =
-      _mesa_sse_transform_points4_identity;
+      _mesa_x86_transform_points4_identity;/*_mesa_sse_transform_points4_identity;*/
 
    _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
       _mesa_sse_transform_normals_no_rot;
@@ -110,7 +114,7 @@ void _mesa_init_sse_transform_asm( void )
    ASSIGN_NORM_GROUP( sse );
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "SSE" );
    _math_test_all_normal_transform_functions( "SSE" );
 #endif