mesa: Add "OR COPYRIGHT HOLDERS" to license text disclaiming liability.

[mesa.git] / src / mesa / x86 / 3dnow.c

diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c
index 37346a8b7b364c763c546fb2523e3f9a52764d04..6954e8417972372b180e89a7066388d9b0ac4459 100644 (file)
--- a/src/mesa/x86/3dnow.c
+++ b/src/mesa/x86/3dnow.c
@@ -1,10 +1,9 @@
-/* $Id: 3dnow.c,v 1.19 2001/03/30 14:44:43 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.0.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  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,7 +18,7 @@
  * 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
+ * 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,16 +28,15 @@
  * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
  */
 
-#include "glheader.h"
-#include "context.h"
-#include "math/m_vertices.h"
+#include "main/glheader.h"
+#include "main/context.h"
 #include "math/m_xform.h"
 #include "tnl/t_context.h"
 
 #include "3dnow.h"
-#include "common_x86_macros.h"
+#include "x86_xform.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -80,25 +78,14 @@ void _mesa_init_3dnow_transform_asm( void )
    ASSIGN_XFORM_GROUP( 3dnow, 3 );
    ASSIGN_XFORM_GROUP( 3dnow, 4 );
 
+   /* There's a bug somewhere in the 3dnow_normal.S file that causes
+    * bad shading.  Disable for now.
    ASSIGN_NORM_GROUP( 3dnow );
+   */
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "3DNow!" );
    _math_test_all_normal_transform_functions( "3DNow!" );
 #endif
 #endif
 }
-
-void _mesa_init_3dnow_vertex_asm( void )
-{
-#ifdef USE_3DNOW_ASM
-   _mesa_xform_points3_v16_general = _mesa_v16_3dnow_general_xform;
-
-   _mesa_project_v16 = _mesa_3dnow_project_vertices;
-   _mesa_project_clipped_v16 = _mesa_3dnow_project_clipped_vertices;
-
-#ifdef DEBUG_NOT
-   _math_test_all_vertex_functions( "3DNow!" );
-#endif
-#endif
-}