Merge branch 'mesa_7_7_branch'
[mesa.git] / src / mesa / x86 / 3dnow.c
index c87ecd6ba7f85a339059336101a01afe3592f23d..de2fb1e2aadb349ed14270777dd53469a0d4cc18 100644 (file)
@@ -1,21 +1,20 @@
-/* $Id: 3dnow.c,v 1.6 2000/09/15 15:54:25 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  5.0.1
+ *
+ * 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"),
  * 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
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 /*
  * 3DNow! optimizations contributed by
  * Holger Waechtler <holger@akaflieg.extern.tu-berlin.de>
  */
-#if defined(USE_3DNOW_ASM) && defined(USE_X86_ASM)
-#include "3dnow.h"
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include "main/glheader.h"
+#include "main/context.h"
+#include "math/m_xform.h"
+#include "tnl/t_context.h"
 
-#include "context.h"
-#include "types.h"
-#include "xform.h"
-#include "vertices.h"
+#include "3dnow.h"
+#include "x86_xform.h"
 
-#ifdef DEBUG
-#include "debug_xform.h"
+#ifdef DEBUG_MATH
+#include "math/m_debug.h"
 #endif
 
 
+#ifdef USE_3DNOW_ASM
+DECLARE_XFORM_GROUP( 3dnow, 2 )
+DECLARE_XFORM_GROUP( 3dnow, 3 )
+DECLARE_XFORM_GROUP( 3dnow, 4 )
 
-
-#define XFORM_ARGS      GLvector4f *to_vec,             \
-                        const GLfloat m[16],            \
-                        const GLvector4f *from_vec,     \
-                        const GLubyte *mask,            \
-                        const GLubyte flag
-
-
-
-#define DECLARE_XFORM_GROUP(pfx, v, masked) \
- extern void _ASMAPI gl##pfx##_transform_points##v##_general_##masked(XFORM_ARGS);    \
- extern void _ASMAPI gl##pfx##_transform_points##v##_identity_##masked(XFORM_ARGS);   \
- extern void _ASMAPI gl##pfx##_transform_points##v##_3d_no_rot_##masked(XFORM_ARGS);  \
- extern void _ASMAPI gl##pfx##_transform_points##v##_perspective_##masked(XFORM_ARGS);\
- extern void _ASMAPI gl##pfx##_transform_points##v##_2d_##masked(XFORM_ARGS);         \
- extern void _ASMAPI gl##pfx##_transform_points##v##_2d_no_rot_##masked(XFORM_ARGS);  \
- extern void _ASMAPI gl##pfx##_transform_points##v##_3d_##masked(XFORM_ARGS);
-
-
-
-#define ASSIGN_XFORM_GROUP( pfx, cma, vsize, masked )           \
- gl_transform_tab[cma][vsize][MATRIX_GENERAL]                   \
-  = gl##pfx##_transform_points##vsize##_general_##masked;      \
- gl_transform_tab[cma][vsize][MATRIX_IDENTITY]                  \
-  = gl##pfx##_transform_points##vsize##_identity_##masked;     \
- gl_transform_tab[cma][vsize][MATRIX_3D_NO_ROT]                 \
-  = gl##pfx##_transform_points##vsize##_3d_no_rot_##masked;    \
- gl_transform_tab[cma][vsize][MATRIX_PERSPECTIVE]               \
-  = gl##pfx##_transform_points##vsize##_perspective_##masked;  \
- gl_transform_tab[cma][vsize][MATRIX_2D]                        \
-  = gl##pfx##_transform_points##vsize##_2d_##masked;           \
- gl_transform_tab[cma][vsize][MATRIX_2D_NO_ROT]                 \
-  = gl##pfx##_transform_points##vsize##_2d_no_rot_##masked;    \
- gl_transform_tab[cma][vsize][MATRIX_3D]                        \
-  = gl##pfx##_transform_points##vsize##_3d_##masked;
-
-
-
-
-#define NORM_ARGS       const GLmatrix *mat,        \
-                        GLfloat scale,              \
-                        const GLvector3f *in,       \
-                        const GLfloat *lengths,     \
-                        const GLubyte mask[],       \
-                        GLvector3f *dest 
-
+DECLARE_NORM_GROUP( 3dnow )
 
 
-#define DECLARE_NORM_GROUP(pfx, masked)                                        \
- extern void _ASMAPI gl##pfx##_rescale_normals_##masked## (NORM_ARGS);                \
- extern void _ASMAPI gl##pfx##_normalize_normals_##masked## (NORM_ARGS);              \
- extern void _ASMAPI gl##pfx##_transform_normals_##masked## (NORM_ARGS);              \
- extern void _ASMAPI gl##pfx##_transform_normals_no_rot_##masked## (NORM_ARGS);       \
- extern void _ASMAPI gl##pfx##_transform_rescale_normals_##masked## (NORM_ARGS);      \
- extern void _ASMAPI gl##pfx##_transform_rescale_normals_no_rot_##masked## (NORM_ARGS); \
- extern void _ASMAPI gl##pfx##_transform_normalize_normals_##masked## (NORM_ARGS);    \
- extern void _ASMAPI gl##pfx##_transform_normalize_normals_no_rot_##masked## (NORM_ARGS);
+extern void _ASMAPI
+_mesa_v16_3dnow_general_xform( GLfloat *first_vert,
+                              const GLfloat *m,
+                              const GLfloat *src,
+                              GLuint src_stride,
+                              GLuint count );
 
+extern void _ASMAPI
+_mesa_3dnow_project_vertices( GLfloat *first,
+                             GLfloat *last,
+                             const GLfloat *m,
+                             GLuint stride );
 
-
-#define ASSIGN_NORM_GROUP( pfx, cma, masked )                                 \
-   gl_normal_tab[NORM_RESCALE][cma]   =                                       \
-      gl##pfx##_rescale_normals_##masked##;                                  \
-   gl_normal_tab[NORM_NORMALIZE][cma] =                                       \
-      gl##pfx##_normalize_normals_##masked##;                                \
-   gl_normal_tab[NORM_TRANSFORM][cma] =                                       \
-      gl##pfx##_transform_normals_##masked##;                                \
-   gl_normal_tab[NORM_TRANSFORM_NO_ROT][cma] =                                \
-      gl##pfx##_transform_normals_no_rot_##masked##;                         \
-   gl_normal_tab[NORM_TRANSFORM | NORM_RESCALE][cma] =                        \
-      gl##pfx##_transform_rescale_normals_##masked##;                        \
-   gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE][cma] =                 \
-      gl##pfx##_transform_rescale_normals_no_rot_##masked##;                 \
-   gl_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE][cma] =                      \
-      gl##pfx##_transform_normalize_normals_##masked##;                      \
-   gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE][cma] =               \
-         gl##pfx##_transform_normalize_normals_no_rot_##masked##;
-
-
-extern void _ASMAPI gl_3dnow_project_vertices( GLfloat *first,
-                                      GLfloat *last,
-                                      const GLfloat *m,
-                                      GLuint stride );
-
-extern void _ASMAPI gl_3dnow_project_clipped_vertices( GLfloat *first,
-                                              GLfloat *last,
-                                              const GLfloat *m,
-                                              GLuint stride,
-                                              const GLubyte *clipmask );
-
-extern void _ASMAPI gl_v16_3dnow_general_xform( GLfloat *first_vert,
-                                       const GLfloat *m,
-                                       const GLfloat *src,
-                                       GLuint src_stride,
-                                       GLuint count );
-
-
-DECLARE_XFORM_GROUP( _3dnow, 1, raw )
-DECLARE_XFORM_GROUP( _3dnow, 2, raw )
-DECLARE_XFORM_GROUP( _3dnow, 3, raw )
-DECLARE_XFORM_GROUP( _3dnow, 4, raw )
-
-DECLARE_XFORM_GROUP( _3dnow, 1, masked )
-DECLARE_XFORM_GROUP( _3dnow, 2, masked )
-DECLARE_XFORM_GROUP( _3dnow, 3, masked )
-DECLARE_XFORM_GROUP( _3dnow, 4, masked )
-
-DECLARE_NORM_GROUP( _3dnow, raw )
-/*DECLARE_NORM_GROUP( _3dnow, masked )*/
-
-void gl_init_3dnow_asm_transforms (void)
-{
-   ASSIGN_XFORM_GROUP( _3dnow, 0, 1, raw )
-   ASSIGN_XFORM_GROUP( _3dnow, 0, 2, raw )
-   ASSIGN_XFORM_GROUP( _3dnow, 0, 3, raw )
-   ASSIGN_XFORM_GROUP( _3dnow, 0, 4, raw )
-
-   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 1, masked )
-   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 2, masked )
-   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 3, masked )
-   ASSIGN_XFORM_GROUP( _3dnow, CULL_MASK_ACTIVE, 4, masked )
-
-   ASSIGN_NORM_GROUP( _3dnow, 0, raw )
-/* ASSIGN_NORM_GROUP( _3dnow, CULL_MASK_ACTIVE, masked )*/
-
-#ifdef DEBUG
-   gl_test_all_transform_functions("3Dnow!");
-   gl_test_all_normal_transform_functions("3Dnow!");
+extern void _ASMAPI
+_mesa_3dnow_project_clipped_vertices( GLfloat *first,
+                                     GLfloat *last,
+                                     const GLfloat *m,
+                                     GLuint stride,
+                                     const GLubyte *clipmask );
 #endif
 
-   /* Hook in some stuff for vertices.c.
-    */
-   gl_xform_points3_v16_general = gl_v16_3dnow_general_xform;
-   gl_project_v16 = gl_3dnow_project_vertices;
-   gl_project_clipped_v16 = gl_3dnow_project_clipped_vertices;
-} 
-
-#else
 
-
-/* silence compiler warning */
-extern void _mesa_3dnow_dummy_function(void);
-void _mesa_3dnow_dummy_function(void)
+void _mesa_init_3dnow_transform_asm( void )
 {
-}
-
+#ifdef USE_3DNOW_ASM
+   ASSIGN_XFORM_GROUP( 3dnow, 2 );
+   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_MATH
+   _math_test_all_transform_functions( "3DNow!" );
+   _math_test_all_normal_transform_functions( "3DNow!" );
+#endif
 #endif
+}