more namespace clean-ups

4 files changed, 29 insertions, 29 deletions

diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c
index cf01d4c9c3..e5302cbdee 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 91479a38d1..3d02cae4a2 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 0789670da6..8394c504d7 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 0af2f65f7c..0279d13d37 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)