X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fx86%2F3dnow.c;h=032aa661f44d38993b6671ff49584e1bd21bcfea;hb=832417f31e81b415894414621500b7aef328652b;hp=5dc3b38fa16eaf91390ddc82ca0190ef6080665b;hpb=f3c399ec11947add49d3a5e9d36d93ff6b45d93e;p=mesa.git diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c index 5dc3b38fa16..032aa661f44 100644 --- a/src/mesa/x86/3dnow.c +++ b/src/mesa/x86/3dnow.c @@ -1,10 +1,10 @@ -/* $Id: 3dnow.c,v 1.7 2000/09/17 21:12:40 gareth Exp $ */ +/* $Id: 3dnow.c,v 1.24 2005/10/07 17:18:52 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 5.0.1 * - * Copyright (C) 1999-2000 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"), @@ -24,175 +24,69 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - /* * 3DNow! optimizations contributed by * Holger Waechtler */ -#if defined(USE_3DNOW_ASM) && defined(USE_X86_ASM) -#include "3dnow.h" - -#include -#include -#include -#include +#include "glheader.h" #include "context.h" -#include "types.h" -#include "xform.h" -#include "vertices.h" - -#ifdef DEBUG -#include "debug_xform.h" -#endif - - - - -#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 - - - -#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); - +#include "math/m_xform.h" +#include "tnl/t_context.h" +#include "3dnow.h" +#include "common_x86_macros.h" -#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; +#ifdef DEBUG_MATH +#include "math/m_debug.h" +#endif -extern void _ASMAPI gl_3dnow_project_vertices( GLfloat *first, - GLfloat *last, - const GLfloat *m, - GLuint stride ); +#ifdef USE_3DNOW_ASM +DECLARE_XFORM_GROUP( 3dnow, 2 ) +DECLARE_XFORM_GROUP( 3dnow, 3 ) +DECLARE_XFORM_GROUP( 3dnow, 4 ) -extern void _ASMAPI gl_3dnow_project_clipped_vertices( GLfloat *first, - GLfloat *last, - const GLfloat *m, - GLuint stride, - const GLubyte *clipmask ); +DECLARE_NORM_GROUP( 3dnow ) -extern void _ASMAPI gl_v16_3dnow_general_xform( GLfloat *first_vert, - const GLfloat *m, - const GLfloat *src, - GLuint src_stride, - GLuint count ); +extern void _ASMAPI +_mesa_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 ) +extern void _ASMAPI +_mesa_3dnow_project_vertices( GLfloat *first, + GLfloat *last, + const GLfloat *m, + GLuint stride ); -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 +}