Used synchronise script to update files

1 files changed, 123 insertions, 123 deletions

diff --git a/mesalib/src/mesa/x86/sse.c b/mesalib/src/mesa/x86/sse.c
index b249811c7..aef15b531 100644
--- a/mesalib/src/mesa/x86/sse.c
+++ b/mesalib/src/mesa/x86/sse.c
@@ -1,123 +1,123 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.0

- *

- * 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"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * 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.

- */

-

-/*

- * PentiumIII-SIMD (SSE) optimizations contributed by

- * Andre Werthmann <wertmann@cs.uni-potsdam.de>

- */

-

-#include "main/glheader.h"

-#include "main/context.h"

-#include "math/m_xform.h"

-#include "tnl/t_context.h"

-

-#include "sse.h"

-#include "x86_xform.h"

-

-#ifdef DEBUG_MATH

-#include "math/m_debug.h"

-#endif

-

-

-#ifdef USE_SSE_ASM

-DECLARE_XFORM_GROUP( sse, 2 )

-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 );

-/* XXX this function segfaults, see below */

-extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );

-/* XXX this one works, see below */

-extern void _ASMAPI _mesa_x86_transform_points4_identity( XFORM_ARGS );

-#else

-DECLARE_NORM_GROUP( sse )

-#endif

-

-

-extern void _ASMAPI

-_mesa_v16_sse_general_xform( GLfloat *first_vert,

-			     const GLfloat *m,

-			     const GLfloat *src,

-			     GLuint src_stride,

-			     GLuint count );

-

-extern void _ASMAPI

-_mesa_sse_project_vertices( GLfloat *first,

-			    GLfloat *last,

-			    const GLfloat *m,

-			    GLuint stride );

-

-extern void _ASMAPI

-_mesa_sse_project_clipped_vertices( GLfloat *first,

-				    GLfloat *last,

-				    const GLfloat *m,

-				    GLuint stride,

-				    const GLubyte *clipmask );

-#endif

-

-

-void _mesa_init_sse_transform_asm( void )

-{

-#ifdef USE_SSE_ASM

-   ASSIGN_XFORM_GROUP( sse, 2 );

-   ASSIGN_XFORM_GROUP( sse, 3 );

-

-#if 1

-   /* TODO: Finish these off.

-    */

-   _mesa_transform_tab[4][MATRIX_GENERAL] =

-      _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_x86_transform_points4_identity;/*_mesa_sse_transform_points4_identity;*/

-

-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =

-      _mesa_sse_transform_normals_no_rot;

-   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =

-      _mesa_sse_transform_rescale_normals;

-   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =

-      _mesa_sse_transform_rescale_normals_no_rot;

-#else

-   ASSIGN_XFORM_GROUP( sse, 4 );

-

-   ASSIGN_NORM_GROUP( sse );

-#endif

-

-#ifdef DEBUG_MATH

-   _math_test_all_transform_functions( "SSE" );

-   _math_test_all_normal_transform_functions( "SSE" );

-#endif

-#endif

-}

-

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.0
+ *
+ * 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"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * 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.
+ */
+
+/*
+ * PentiumIII-SIMD (SSE) optimizations contributed by
+ * Andre Werthmann <wertmann@cs.uni-potsdam.de>
+ */
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
+
+#include "sse.h"
+#include "x86_xform.h"
+
+#ifdef DEBUG_MATH
+#include "math/m_debug.h"
+#endif
+
+
+#ifdef USE_SSE_ASM
+DECLARE_XFORM_GROUP( sse, 2 )
+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 );
+/* XXX this function segfaults, see below */
+extern void _ASMAPI _mesa_sse_transform_points4_identity( XFORM_ARGS );
+/* XXX this one works, see below */
+extern void _ASMAPI _mesa_x86_transform_points4_identity( XFORM_ARGS );
+#else
+DECLARE_NORM_GROUP( sse )
+#endif
+
+
+extern void _ASMAPI
+_mesa_v16_sse_general_xform( GLfloat *first_vert,
+			     const GLfloat *m,
+			     const GLfloat *src,
+			     GLuint src_stride,
+			     GLuint count );
+
+extern void _ASMAPI
+_mesa_sse_project_vertices( GLfloat *first,
+			    GLfloat *last,
+			    const GLfloat *m,
+			    GLuint stride );
+
+extern void _ASMAPI
+_mesa_sse_project_clipped_vertices( GLfloat *first,
+				    GLfloat *last,
+				    const GLfloat *m,
+				    GLuint stride,
+				    const GLubyte *clipmask );
+#endif
+
+
+void _mesa_init_sse_transform_asm( void )
+{
+#ifdef USE_SSE_ASM
+   ASSIGN_XFORM_GROUP( sse, 2 );
+   ASSIGN_XFORM_GROUP( sse, 3 );
+
+#if 1
+   /* TODO: Finish these off.
+    */
+   _mesa_transform_tab[4][MATRIX_GENERAL] =
+      _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_x86_transform_points4_identity;/*_mesa_sse_transform_points4_identity;*/
+
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT] =
+      _mesa_sse_transform_normals_no_rot;
+   _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals;
+   _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE] =
+      _mesa_sse_transform_rescale_normals_no_rot;
+#else
+   ASSIGN_XFORM_GROUP( sse, 4 );
+
+   ASSIGN_NORM_GROUP( sse );
+#endif
+
+#ifdef DEBUG_MATH
+   _math_test_all_transform_functions( "SSE" );
+   _math_test_all_normal_transform_functions( "SSE" );
+#endif
+#endif
+}
+