From 188f2949eaf181f4aab041a6dad26fa76e746eee Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 3 Mar 2001 20:56:59 +0000 Subject: [PATCH] more namespace clean-ups --- src/mesa/math/m_clip_tmp.h | 14 +++--- src/mesa/math/m_debug_norm.c | 6 +-- src/mesa/math/m_dotprod_tmp.h | 8 ++-- src/mesa/math/m_norm_tmp.h | 18 +++---- src/mesa/math/m_xform.c | 10 ++-- src/mesa/math/m_xform.h | 10 ++-- src/mesa/tnl/t_vb_fog.c | 6 +-- src/mesa/tnl/t_vb_normals.c | 12 ++--- src/mesa/tnl/t_vb_texgen.c | 18 +++---- src/mesa/tnl/t_vb_vertex.c | 22 ++++----- src/mesa/x86/3dnow.c | 90 +++++++++++++++++------------------ src/mesa/x86/x86.c | 46 +++++++++--------- 12 files changed, 130 insertions(+), 130 deletions(-) diff --git a/src/mesa/math/m_clip_tmp.h b/src/mesa/math/m_clip_tmp.h index 62c7e37ae90..9c97f97de0e 100644 --- a/src/mesa/math/m_clip_tmp.h +++ b/src/mesa/math/m_clip_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_clip_tmp.h,v 1.4 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: m_clip_tmp.h,v 1.5 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -219,11 +219,11 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec, static void TAG(init_c_cliptest)( void ) { - gl_clip_tab[4] = TAG(cliptest_points4); - gl_clip_tab[3] = TAG(cliptest_points3); - gl_clip_tab[2] = TAG(cliptest_points2); + _mesa_clip_tab[4] = TAG(cliptest_points4); + _mesa_clip_tab[3] = TAG(cliptest_points3); + _mesa_clip_tab[2] = TAG(cliptest_points2); - gl_clip_np_tab[4] = TAG(cliptest_np_points4); - gl_clip_np_tab[3] = TAG(cliptest_points3); - gl_clip_np_tab[2] = TAG(cliptest_points2); + _mesa_clip_np_tab[4] = TAG(cliptest_np_points4); + _mesa_clip_np_tab[3] = TAG(cliptest_points3); + _mesa_clip_np_tab[2] = TAG(cliptest_points2); } diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c index 3c37760032a..55179ff01e7 100644 --- a/src/mesa/math/m_debug_norm.c +++ b/src/mesa/math/m_debug_norm.c @@ -1,4 +1,4 @@ -/* $Id: m_debug_norm.c,v 1.2 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: m_debug_norm.c,v 1.3 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -377,12 +377,12 @@ void _math_test_all_normal_transform_functions( char *description ) #endif for ( mtype = 0 ; mtype < 8 ; mtype++ ) { - normal_func func = gl_normal_tab[norm_types[mtype]][cma]; + normal_func func = _mesa_normal_tab[norm_types[mtype]][cma]; long *cycles = &(benchmark_tab[mtype][cma]); if ( test_norm_function( func, mtype, masked, cycles ) == 0 ) { char buf[100]; - sprintf( buf, "gl_normal_tab[%s][%s] failed test (%s)", + sprintf( buf, "_mesa_normal_tab[%s][%s] failed test (%s)", cmastring, norm_strings[mtype], description ); _mesa_problem( NULL, buf ); } diff --git a/src/mesa/math/m_dotprod_tmp.h b/src/mesa/math/m_dotprod_tmp.h index 4bd875c6813..88a9b37fa55 100644 --- a/src/mesa/math/m_dotprod_tmp.h +++ b/src/mesa/math/m_dotprod_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_dotprod_tmp.h,v 1.2 2000/12/26 05:09:31 keithw Exp $ */ +/* $Id: m_dotprod_tmp.h,v 1.3 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -112,7 +112,7 @@ static void TAG(dotprod_vec4)( GLfloat *out, static void TAG(init_dotprod)( void ) { - gl_dotprod_tab[IDX&1][2] = TAG(dotprod_vec2); - gl_dotprod_tab[IDX&1][3] = TAG(dotprod_vec3); - gl_dotprod_tab[IDX&1][4] = TAG(dotprod_vec4); + _mesa_dotprod_tab[IDX&1][2] = TAG(dotprod_vec2); + _mesa_dotprod_tab[IDX&1][3] = TAG(dotprod_vec3); + _mesa_dotprod_tab[IDX&1][4] = TAG(dotprod_vec4); } diff --git a/src/mesa/math/m_norm_tmp.h b/src/mesa/math/m_norm_tmp.h index 45111a41294..ccaa2247e87 100644 --- a/src/mesa/math/m_norm_tmp.h +++ b/src/mesa/math/m_norm_tmp.h @@ -1,4 +1,4 @@ -/* $Id: m_norm_tmp.h,v 1.3 2000/12/28 22:11:05 keithw Exp $ */ +/* $Id: m_norm_tmp.h,v 1.4 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -387,27 +387,27 @@ TAG(rescale_normals)( const GLmatrix *mat, static void _XFORMAPI TAG(init_c_norm_transform)( void ) { - gl_normal_tab[NORM_TRANSFORM_NO_ROT][IDX] = + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT][IDX] = TAG(transform_normals_no_rot); - gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE][IDX] = + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE][IDX] = TAG(transform_rescale_normals_no_rot); - gl_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE][IDX] = + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE][IDX] = TAG(transform_normalize_normals_no_rot); - gl_normal_tab[NORM_TRANSFORM][IDX] = + _mesa_normal_tab[NORM_TRANSFORM][IDX] = TAG(transform_normals); - gl_normal_tab[NORM_TRANSFORM | NORM_RESCALE][IDX] = + _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE][IDX] = TAG(transform_rescale_normals); - gl_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE][IDX] = + _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE][IDX] = TAG(transform_normalize_normals); - gl_normal_tab[NORM_RESCALE][IDX] = + _mesa_normal_tab[NORM_RESCALE][IDX] = TAG(rescale_normals); - gl_normal_tab[NORM_NORMALIZE][IDX] = + _mesa_normal_tab[NORM_NORMALIZE][IDX] = TAG(normalize_normals); } diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c index 3a677ddfe6a..f896bb1e03b 100644 --- a/src/mesa/math/m_xform.c +++ b/src/mesa/math/m_xform.c @@ -1,4 +1,4 @@ -/* $Id: m_xform.c,v 1.9 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: m_xform.c,v 1.10 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -56,11 +56,11 @@ #include "X86/common_x86_asm.h" #endif -clip_func gl_clip_tab[5]; -clip_func gl_clip_np_tab[5]; -dotprod_func gl_dotprod_tab[2][5]; +clip_func _mesa_clip_tab[5]; +clip_func _mesa_clip_np_tab[5]; +dotprod_func _mesa_dotprod_tab[2][5]; vec_copy_func _mesa_copy_tab[2][0x10]; -normal_func gl_normal_tab[0xf][0x4]; +normal_func _mesa_normal_tab[0xf][0x4]; transform_func **(_mesa_transform_tab[2]); static transform_func *cull_transform_tab[5]; static transform_func *raw_transform_tab[5]; diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h index 27496feb784..d8b019cc548 100644 --- a/src/mesa/math/m_xform.h +++ b/src/mesa/math/m_xform.h @@ -1,4 +1,4 @@ -/* $Id: m_xform.h,v 1.6 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: m_xform.h,v 1.7 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -197,12 +197,12 @@ extern void _mesa_transform_bounds2( GLubyte *orMask, GLubyte *andMask, CONST GLfloat src[][3] ); -extern dotprod_func gl_dotprod_tab[2][5]; +extern dotprod_func _mesa_dotprod_tab[2][5]; extern vec_copy_func _mesa_copy_tab[2][0x10]; extern vec_copy_func _mesa_copy_clean_tab[2][5]; -extern clip_func gl_clip_tab[5]; -extern clip_func gl_clip_np_tab[5]; -extern normal_func gl_normal_tab[0xf][0x4]; +extern clip_func _mesa_clip_tab[5]; +extern clip_func _mesa_clip_np_tab[5]; +extern normal_func _mesa_normal_tab[0xf][0x4]; /* Use of 3 layers of linked 1-dimensional arrays to reduce * cost of lookup. diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c index cf01d4c9c32..e5302cbdeee 100644 --- a/src/mesa/tnl/t_vb_fog.c +++ b/src/mesa/tnl/t_vb_fog.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_fog.c,v 1.5 2001/03/03 20:33:31 brianp Exp $ */ +/* $Id: t_vb_fog.c,v 1.6 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -157,8 +157,8 @@ static GLboolean run_fog_stage( GLcontext *ctx, /* Full eye coords weren't required, just calculate the * eye Z values. */ - gl_dotprod_tab[0][VB->ObjPtr->size](input->data, sizeof(GLfloat), - VB->ObjPtr, plane, 0 ); + _mesa_dotprod_tab[0][VB->ObjPtr->size](input->data, sizeof(GLfloat), + VB->ObjPtr, plane, 0 ); input->count = VB->ObjPtr->count; } diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 91479a38d1b..3d02cae4a23 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_normals.c,v 1.4 2001/03/03 20:33:31 brianp Exp $ */ +/* $Id: t_vb_normals.c,v 1.5 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -92,23 +92,23 @@ static GLboolean run_validate_normal_stage( GLcontext *ctx, if (ctx->Transform.Normalize) { - store->NormalTransform = gl_normal_tab[transform | NORM_NORMALIZE]; + store->NormalTransform = _mesa_normal_tab[transform | NORM_NORMALIZE]; } else if (ctx->Transform.RescaleNormals && ctx->_ModelViewInvScale != 1.0) { - store->NormalTransform = gl_normal_tab[transform | NORM_RESCALE]; + store->NormalTransform = _mesa_normal_tab[transform | NORM_RESCALE]; } else { - store->NormalTransform = gl_normal_tab[transform]; + store->NormalTransform = _mesa_normal_tab[transform]; } } else { if (ctx->Transform.Normalize) { - store->NormalTransform = gl_normal_tab[NORM_NORMALIZE]; + store->NormalTransform = _mesa_normal_tab[NORM_NORMALIZE]; } else if (!ctx->Transform.RescaleNormals && ctx->_ModelViewInvScale != 1.0) { - store->NormalTransform = gl_normal_tab[NORM_RESCALE]; + store->NormalTransform = _mesa_normal_tab[NORM_RESCALE]; } else { store->NormalTransform = 0; diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c index 0789670da6e..8394c504d70 100644 --- a/src/mesa/tnl/t_vb_texgen.c +++ b/src/mesa/tnl/t_vb_texgen.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_texgen.c,v 1.3 2001/03/03 20:33:31 brianp Exp $ */ +/* $Id: t_vb_texgen.c,v 1.4 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -413,12 +413,12 @@ static void texgen( GLcontext *ctx, GLuint i; switch (texUnit->GenModeS) { case GL_OBJECT_LINEAR: - (gl_dotprod_tab[0][obj->size])((GLfloat *)out->data, + (_mesa_dotprod_tab[0][obj->size])((GLfloat *)out->data, sizeof(out->data[0]), obj, texUnit->ObjectPlaneS, 0); break; case GL_EYE_LINEAR: - (gl_dotprod_tab[0][eye->size])((GLfloat *)out->data, + (_mesa_dotprod_tab[0][eye->size])((GLfloat *)out->data, sizeof(out->data[0]), eye, texUnit->EyePlaneS, 0); break; @@ -446,12 +446,12 @@ static void texgen( GLcontext *ctx, GLuint i; switch (texUnit->GenModeT) { case GL_OBJECT_LINEAR: - (gl_dotprod_tab[0][obj->size])(&(out->data[0][1]), + (_mesa_dotprod_tab[0][obj->size])(&(out->data[0][1]), sizeof(out->data[0]), obj, texUnit->ObjectPlaneT, 0); break; case GL_EYE_LINEAR: - (gl_dotprod_tab[0][eye->size])(&(out->data[0][1]), + (_mesa_dotprod_tab[0][eye->size])(&(out->data[0][1]), sizeof(out->data[0]), eye, texUnit->EyePlaneT, 0); break; @@ -479,12 +479,12 @@ static void texgen( GLcontext *ctx, GLuint i; switch (texUnit->GenModeR) { case GL_OBJECT_LINEAR: - (gl_dotprod_tab[0][obj->size])(&(out->data[0][2]), + (_mesa_dotprod_tab[0][obj->size])(&(out->data[0][2]), sizeof(out->data[0]), obj, texUnit->ObjectPlaneR, 0); break; case GL_EYE_LINEAR: - (gl_dotprod_tab[0][eye->size])(&(out->data[0][2]), + (_mesa_dotprod_tab[0][eye->size])(&(out->data[0][2]), sizeof(out->data[0]), eye, texUnit->EyePlaneR, 0); break; @@ -507,12 +507,12 @@ static void texgen( GLcontext *ctx, if (texUnit->TexGenEnabled & Q_BIT) { switch (texUnit->GenModeQ) { case GL_OBJECT_LINEAR: - (gl_dotprod_tab[0][obj->size])(&(out->data[0][3]), + (_mesa_dotprod_tab[0][obj->size])(&(out->data[0][3]), sizeof(out->data[0]), obj, texUnit->ObjectPlaneQ, 0); break; case GL_EYE_LINEAR: - (gl_dotprod_tab[0][eye->size])(&(out->data[0][3]), + (_mesa_dotprod_tab[0][eye->size])(&(out->data[0][3]), sizeof(out->data[0]), eye, texUnit->EyePlaneQ, 0); break; diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c index 0af2f65f7c8..0279d13d378 100644 --- a/src/mesa/tnl/t_vb_vertex.c +++ b/src/mesa/tnl/t_vb_vertex.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_vertex.c,v 1.4 2001/03/03 20:33:31 brianp Exp $ */ +/* $Id: t_vb_vertex.c,v 1.5 2001/03/03 20:57:00 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -188,19 +188,19 @@ static GLboolean run_vertex_stage( GLcontext *ctx, if (tnl->NeedProjCoords) { VB->ProjectedClipPtr = - gl_clip_tab[VB->ClipPtr->size]( VB->ClipPtr, - &store->proj, - store->clipmask, - &store->ormask, - &store->andmask ); + _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr, + &store->proj, + store->clipmask, + &store->ormask, + &store->andmask ); } else { VB->ProjectedClipPtr = 0; - gl_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr, - 0, - store->clipmask, - &store->ormask, - &store->andmask ); + _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr, + 0, + store->clipmask, + &store->ormask, + &store->andmask ); } if (store->andmask) diff --git a/src/mesa/x86/3dnow.c b/src/mesa/x86/3dnow.c index 2d67d9512d5..9c00baaa907 100644 --- a/src/mesa/x86/3dnow.c +++ b/src/mesa/x86/3dnow.c @@ -1,4 +1,4 @@ -/* $Id: 3dnow.c,v 1.15 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: 3dnow.c,v 1.16 2001/03/03 20:56:59 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -52,30 +52,30 @@ #define DECLARE_XFORM_GROUP( pfx, sz, masked ) \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS ); + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS ); #define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked ) \ _mesa_transform_tab[cma][sz][MATRIX_GENERAL] = \ - gl_##pfx##_transform_points##sz##_general_##masked; \ + _mesa_##pfx##_transform_points##sz##_general_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_IDENTITY] = \ - gl_##pfx##_transform_points##sz##_identity_##masked; \ + _mesa_##pfx##_transform_points##sz##_identity_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ - gl_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ + _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ - gl_##pfx##_transform_points##sz##_perspective_##masked; \ + _mesa_##pfx##_transform_points##sz##_perspective_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_2D] = \ - gl_##pfx##_transform_points##sz##_2d_##masked; \ + _mesa_##pfx##_transform_points##sz##_2d_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ - gl_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ + _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_3D] = \ - gl_##pfx##_transform_points##sz##_3d_##masked; + _mesa_##pfx##_transform_points##sz##_3d_##masked; @@ -88,33 +88,33 @@ #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_##pfx##_rescale_normals_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_normalize_normals_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_normals_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_normals_no_rot_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_rescale_normals_no_rot_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_##masked( NORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_normalize_normals_no_rot_##masked( NORM_ARGS ); #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; + _mesa_normal_tab[NORM_RESCALE][cma] = \ + _mesa_##pfx##_rescale_normals_##masked; \ + _mesa_normal_tab[NORM_NORMALIZE][cma] = \ + _mesa_##pfx##_normalize_normals_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM][cma] = \ + _mesa_##pfx##_transform_normals_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT][cma] = \ + _mesa_##pfx##_transform_normals_no_rot_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM | NORM_RESCALE][cma] = \ + _mesa_##pfx##_transform_rescale_normals_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_RESCALE][cma] = \ + _mesa_##pfx##_transform_rescale_normals_no_rot_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM | NORM_NORMALIZE][cma] = \ + _mesa_##pfx##_transform_normalize_normals_##masked; \ + _mesa_normal_tab[NORM_TRANSFORM_NO_ROT | NORM_NORMALIZE][cma] = \ + _mesa_##pfx##_transform_normalize_normals_no_rot_##masked; #ifdef USE_3DNOW_ASM @@ -132,18 +132,18 @@ DECLARE_NORM_GROUP( 3dnow, raw ) /*DECLARE_NORM_GROUP( 3dnow, masked )*/ -extern void _ASMAPI gl_v16_3dnow_general_xform( GLfloat *first_vert, +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 gl_3dnow_project_vertices( GLfloat *first, +extern void _ASMAPI _mesa_3dnow_project_vertices( GLfloat *first, GLfloat *last, const GLfloat *m, GLuint stride ); -extern void _ASMAPI gl_3dnow_project_clipped_vertices( GLfloat *first, +extern void _ASMAPI _mesa_3dnow_project_clipped_vertices( GLfloat *first, GLfloat *last, const GLfloat *m, GLuint stride, @@ -177,9 +177,9 @@ void _mesa_init_3dnow_transform_asm( void ) void _mesa_init_3dnow_vertex_asm( void ) { #ifdef USE_3DNOW_ASM - 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; + _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!" ); diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c index b7600439a60..80d58946ccc 100644 --- a/src/mesa/x86/x86.c +++ b/src/mesa/x86/x86.c @@ -1,4 +1,4 @@ -/* $Id: x86.c,v 1.17 2001/03/03 20:33:30 brianp Exp $ */ +/* $Id: x86.c,v 1.18 2001/03/03 20:56:59 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -51,30 +51,30 @@ #define DECLARE_XFORM_GROUP( pfx, sz, masked ) \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS ); \ - extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS ); + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS ); \ + extern void _ASMAPI _mesa_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS ); #define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked ) \ _mesa_transform_tab[cma][sz][MATRIX_GENERAL] = \ - gl_##pfx##_transform_points##sz##_general_##masked; \ + _mesa_##pfx##_transform_points##sz##_general_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_IDENTITY] = \ - gl_##pfx##_transform_points##sz##_identity_##masked; \ + _mesa_##pfx##_transform_points##sz##_identity_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_3D_NO_ROT] = \ - gl_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ + _mesa_##pfx##_transform_points##sz##_3d_no_rot_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_PERSPECTIVE] = \ - gl_##pfx##_transform_points##sz##_perspective_##masked; \ + _mesa_##pfx##_transform_points##sz##_perspective_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_2D] = \ - gl_##pfx##_transform_points##sz##_2d_##masked; \ + _mesa_##pfx##_transform_points##sz##_2d_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_2D_NO_ROT] = \ - gl_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ + _mesa_##pfx##_transform_points##sz##_2d_no_rot_##masked; \ _mesa_transform_tab[cma][sz][MATRIX_3D] = \ - gl_##pfx##_transform_points##sz##_3d_##masked; + _mesa_##pfx##_transform_points##sz##_3d_##masked; #ifdef USE_X86_ASM @@ -86,28 +86,28 @@ DECLARE_XFORM_GROUP( x86, 3, masked ) DECLARE_XFORM_GROUP( x86, 4, masked ) -extern GLvector4f * _ASMAPI gl_x86_cliptest_points4( GLvector4f *clip_vec, +extern GLvector4f * _ASMAPI _mesa_x86_cliptest_points4( GLvector4f *clip_vec, GLvector4f *proj_vec, GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask ); -extern GLvector4f * _ASMAPI gl_x86_cliptest_points4_np( GLvector4f *clip_vec, +extern GLvector4f * _ASMAPI _mesa_x86_cliptest_points4_np( GLvector4f *clip_vec, GLvector4f *proj_vec, GLubyte clipMask[], GLubyte *orMask, GLubyte *andMask ); -extern void _ASMAPI gl_v16_x86_cliptest_points4( GLfloat *first_vert, +extern void _ASMAPI _mesa_v16_x86_cliptest_points4( GLfloat *first_vert, GLfloat *last_vert, GLubyte *or_mask, GLubyte *and_mask, GLubyte *clip_mask ); -extern void _ASMAPI gl_v16_x86_general_xform( GLfloat *dest, +extern void _ASMAPI _mesa_v16_x86_general_xform( GLfloat *dest, const GLfloat *m, const GLfloat *src, GLuint src_stride, @@ -127,8 +127,8 @@ void _mesa_init_x86_transform_asm( void ) /* ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked ); */ /* XXX this function has been found to cause FP overflow exceptions */ - gl_clip_tab[4] = gl_x86_cliptest_points4; - gl_clip_np_tab[4] = gl_x86_cliptest_points4_np; + _mesa_clip_tab[4] = _mesa_x86_cliptest_points4; + _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np; #ifdef DEBUG _math_test_all_transform_functions( "x86" ); @@ -139,8 +139,8 @@ void _mesa_init_x86_transform_asm( void ) void _mesa_init_x86_vertex_asm( void ) { #ifdef USE_X86_ASM - gl_xform_points3_v16_general = gl_v16_x86_general_xform; - gl_cliptest_points4_v16 = gl_v16_x86_cliptest_points4; + _mesa_xform_points3_v16_general = _mesa_v16_x86_general_xform; + _mesa_cliptest_points4_v16 = _mesa_v16_x86_cliptest_points4; #ifdef DEBUG _math_test_all_vertex_functions( "x86" ); -- 2.30.2