lots of gl_*() to _mesa_*() namespace clean-up

14 files changed, 107 insertions, 107 deletions

diff --git a/src/mesa/tnl/t_array_api.c b/src/mesa/tnl/t_array_api.c
index 9a90a2e6965..32dfcb0b8a9 100644
--- a/src/mesa/tnl/t_array_api.c
+++ b/src/mesa/tnl/t_array_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_array_api.c,v 1.7 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: t_array_api.c,v 1.8 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -277,7 +277,7 @@ _tnl_DrawRangeElements(GLenum mode,
 	  *
 	  * Or scan the list and replace bad indices?
 	  */
-	 gl_problem( ctx, 
+	 _mesa_problem( ctx, 
 		     "DrawRangeElements references "
 		     "elements outside locked range.");
       }
@@ -352,16 +352,16 @@ void _tnl_array_init( GLcontext *ctx )
 
    /* Setup vector pointers that will be used to bind arrays to VB's.
     */
-   gl_vector4f_init( &tmp->Obj, 0, 0 );
-   gl_vector3f_init( &tmp->Normal, 0, 0 );
-   gl_vector4chan_init( &tmp->Color, 0, 0 );
-   gl_vector4chan_init( &tmp->SecondaryColor, 0, 0 );
-   gl_vector1f_init( &tmp->FogCoord, 0, 0 );
-   gl_vector1ui_init( &tmp->Index, 0, 0 );
-   gl_vector1ub_init( &tmp->EdgeFlag, 0, 0 );
+   _mesa_vector4f_init( &tmp->Obj, 0, 0 );
+   _mesa_vector3f_init( &tmp->Normal, 0, 0 );
+   _mesa_vector4chan_init( &tmp->Color, 0, 0 );
+   _mesa_vector4chan_init( &tmp->SecondaryColor, 0, 0 );
+   _mesa_vector1f_init( &tmp->FogCoord, 0, 0 );
+   _mesa_vector1ui_init( &tmp->Index, 0, 0 );
+   _mesa_vector1ub_init( &tmp->EdgeFlag, 0, 0 );
 
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) 
-      gl_vector4f_init( &tmp->TexCoord[i], 0, 0);
+      _mesa_vector4f_init( &tmp->TexCoord[i], 0, 0);
 
    tnl->tmp_primitive = (GLuint *)MALLOC(sizeof(GLuint)*tnl->vb.Size);
    tnl->tmp_primitive_length = (GLuint *)MALLOC(sizeof(GLuint)*tnl->vb.Size);
diff --git a/src/mesa/tnl/t_eval_api.c b/src/mesa/tnl/t_eval_api.c
index 0a351eed894..81a65451fe0 100644
--- a/src/mesa/tnl/t_eval_api.c
+++ b/src/mesa/tnl/t_eval_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_eval_api.c,v 1.2 2001/01/08 21:56:00 keithw Exp $ */
+/* $Id: t_eval_api.c,v 1.3 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -69,7 +69,7 @@ _tnl_exec_EvalMesh1( GLenum mode, GLint i1, GLint i2 )
          prim = GL_LINE_STRIP;
          break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glEvalMesh1(mode)" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh1(mode)" );
          return;
    }
 
@@ -186,7 +186,7 @@ _tnl_exec_EvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 )
 	 }
 	 break;
       default:
-	 gl_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glEvalMesh2(mode)" );
 	 return;
       }
 
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index 5dd287cedcc..64cf7b82f66 100644
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -75,10 +75,10 @@ _tnl_begin( GLcontext *ctx, GLenum p )
    GLuint inflags, state;
 
    if (MESA_VERBOSE&VERBOSE_API)
-      fprintf(stderr, "glBegin(IM %d) %s\n", IM->id, gl_lookup_enum_by_nr(p));
+      fprintf(stderr, "glBegin(IM %d) %s\n", IM->id, _mesa_lookup_enum_by_nr(p));
    
    if (ctx->NewState)
-      gl_update_state(ctx);
+      _mesa_update_state(ctx);
        
    /* if only a very few slots left, might as well flush now
     */
@@ -166,7 +166,7 @@ _tnl_hard_begin( GLcontext *ctx, GLenum p )
    GLuint count, last;
    
    if (ctx->NewState)
-      gl_update_state(ctx);
+      _mesa_update_state(ctx);
        
    /* If not compiling, treat as a normal begin().
     */
@@ -261,7 +261,7 @@ _tnl_save_Begin( GLenum mode )
       /* Preserve vtxfmt invarient:
        */
       if (ctx->NewState)
-	 gl_update_state( ctx );
+	 _mesa_update_state( ctx );
 
       /* Slot in geomexec: No need to call setdispatch as we know
        * CurrentDispatch is Save.
@@ -1224,7 +1224,7 @@ _tnl_Materialfv( GLenum face, GLenum pname, const GLfloat *params )
    struct immediate *IM = TNL_CURRENT_IM(ctx);
    GLuint count = IM->Count;
    struct gl_material *mat;
-   GLuint bitmask = gl_material_bitmask( ctx, face, pname, ~0, "Materialfv" );
+   GLuint bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, "Materialfv");
 
    if (bitmask == 0)
       return;
@@ -1236,7 +1236,7 @@ _tnl_Materialfv( GLenum face, GLenum pname, const GLfloat *params )
 	 IM->MaterialMask = (GLuint *) MALLOC( sizeof(GLuint) * IMM_SIZE ); 
       }
       else if (IM->MaterialOrMask & ~bitmask) {
-	 gl_copy_material_pairs( IM->Material[count], 
+	 _mesa_copy_material_pairs( IM->Material[count], 
 				 IM->Material[IM->LastMaterial],
 				 IM->MaterialOrMask & ~bitmask );
       }
diff --git a/src/mesa/tnl/t_imm_dlist.c b/src/mesa/tnl/t_imm_dlist.c
index c722c9629e1..33d3149ed0a 100644
--- a/src/mesa/tnl/t_imm_dlist.c
+++ b/src/mesa/tnl/t_imm_dlist.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_dlist.c,v 1.9 2001/02/16 00:35:35 keithw Exp $ */
+/* $Id: t_imm_dlist.c,v 1.10 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -165,7 +165,7 @@ execute_compiled_cassette( GLcontext *ctx, void *data )
    struct immediate *IM = node->IM;
 
    if (ctx->NewState)
-      gl_update_state(ctx);
+      _mesa_update_state(ctx);
 
    if (tnl->pipeline.build_state_changes)
       _tnl_validate_pipeline( ctx );
@@ -208,7 +208,7 @@ execute_compiled_cassette( GLcontext *ctx, void *data )
 	  * inside a begin/end object -- illegally.  Reject it and
 	  * raise an error.
 	  */
-	 gl_error(ctx, GL_INVALID_OPERATION, "hard replay");
+	 _mesa_error(ctx, GL_INVALID_OPERATION, "hard replay");
 	 return;
       }
    }
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c
index 2e54123fa3e..5de06521683 100644
--- a/src/mesa/tnl/t_imm_exec.c
+++ b/src/mesa/tnl/t_imm_exec.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_exec.c,v 1.13 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: t_imm_exec.c,v 1.14 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -106,8 +106,8 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
    if (flag & VERT_RGBA) {
       COPY_4UBV(ctx->Current.Color, IM->Color[count]);
       if (ctx->Light.ColorMaterialEnabled) {
-	 gl_update_color_material( ctx, ctx->Current.Color );
-	 gl_validate_all_lighting_tables( ctx );
+	 _mesa_update_color_material( ctx, ctx->Current.Color );
+	 _mesa_validate_all_lighting_tables( ctx );
       }
    }
 
@@ -127,11 +127,11 @@ void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
    }
 
    if (flag & VERT_MATERIAL) {
-      gl_update_material( ctx, 
+      _mesa_update_material( ctx, 
 			  IM->Material[IM->LastMaterial], 
 			  IM->MaterialOrMask );
       
-      gl_validate_all_lighting_tables( ctx );
+      _mesa_validate_all_lighting_tables( ctx );
    }
 }
 
@@ -470,16 +470,16 @@ void _tnl_imm_init( GLcontext *ctx )
 
    TNL_CURRENT_IM(ctx)->CopyStart = IMM_MAX_COPIED_VERTS;
 
-   gl_vector4f_init( &tmp->Obj, 0, 0 );
-   gl_vector3f_init( &tmp->Normal, 0, 0 );
-   gl_vector4chan_init( &tmp->Color, 0, 0 );
-   gl_vector4chan_init( &tmp->SecondaryColor, 0, 0 );
-   gl_vector1f_init( &tmp->FogCoord, 0, 0 );
-   gl_vector1ui_init( &tmp->Index, 0, 0 );
-   gl_vector1ub_init( &tmp->EdgeFlag, 0, 0 );
+   _mesa_vector4f_init( &tmp->Obj, 0, 0 );
+   _mesa_vector3f_init( &tmp->Normal, 0, 0 );
+   _mesa_vector4chan_init( &tmp->Color, 0, 0 );
+   _mesa_vector4chan_init( &tmp->SecondaryColor, 0, 0 );
+   _mesa_vector1f_init( &tmp->FogCoord, 0, 0 );
+   _mesa_vector1ui_init( &tmp->Index, 0, 0 );
+   _mesa_vector1ub_init( &tmp->EdgeFlag, 0, 0 );
 
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) 
-      gl_vector4f_init( &tmp->TexCoord[i], 0, 0);
+      _mesa_vector4f_init( &tmp->TexCoord[i], 0, 0);
 
    /* Install the first immediate.  Intially outside begin/end.
     */
diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c
index 5429994b6cc..7827941d23d 100644
--- a/src/mesa/tnl/t_imm_fixup.c
+++ b/src/mesa/tnl/t_imm_fixup.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_fixup.c,v 1.7 2001/02/15 01:33:52 keithw Exp $ */
+/* $Id: t_imm_fixup.c,v 1.8 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -555,7 +555,7 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
       GLuint i;
 
       if (IM->BeginState & VERT_ERROR_1) 
-	 gl_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
+	 _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
 
       for (i = IM->Start ; i <= IM->Count ; i += IM->PrimitiveLength[i])
 	 if (IM->Flag[i] & (VERT_BEGIN|VERT_END_VB)) 
@@ -579,7 +579,7 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
       GLuint i;
 
       if (IM->BeginState & VERT_ERROR_0) 
-	 gl_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
+	 _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin/glEnd");
       
       if (IM->CopyStart == IM->Start &&
 	  IM->Flag[IM->Start] & (VERT_END|VERT_END_VB))
diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c
index e6d0234d5f4..cf01d4c9c32 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.4 2001/02/27 21:58:59 brianp Exp $ */
+/* $Id: t_vb_fog.c,v 1.5 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -122,7 +122,7 @@ static void make_win_fog_coords( GLcontext *ctx, GLvector1f *out,
       }
       break;
    default:
-      gl_problem(ctx, "Bad fog mode in make_fog_coord");
+      _mesa_problem(ctx, "Bad fog mode in make_fog_coord");
       return;
    }
 }
@@ -167,7 +167,7 @@ static GLboolean run_fog_stage( GLcontext *ctx,
 	 input = &store->input;
 
 	 if (VB->EyePtr->size < 2)
-	    gl_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
+	    _mesa_vector4f_clean_elem( VB->EyePtr, VB->Count, 2 );
 
 	 input->data = &(VB->EyePtr->data[0][2]);
 	 input->start = VB->EyePtr->start+2;
@@ -204,8 +204,8 @@ static GLboolean alloc_fog_data( GLcontext *ctx,
    if (!store)
       return GL_FALSE;
 
-   gl_vector1f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
-   gl_vector1f_init( &store->input, 0, 0 );
+   _mesa_vector1f_alloc( &store->fogcoord, 0, tnl->vb.Size, 32 );
+   _mesa_vector1f_init( &store->input, 0, 0 );
 
    if (!inited)
       init_static_data();
@@ -221,7 +221,7 @@ static void free_fog_data( struct gl_pipeline_stage *stage )
 {
    struct fog_stage_data *store = FOG_STAGE_DATA(stage);
    if (store) {
-      gl_vector1f_free( &store->fogcoord );
+      _mesa_vector1f_free( &store->fogcoord );
       FREE( store );
       stage->private = 0;
    }
diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c
index 53f23ec4e10..6ccb1b0dff6 100644
--- a/src/mesa/tnl/t_vb_light.c
+++ b/src/mesa/tnl/t_vb_light.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_light.c,v 1.9 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: t_vb_light.c,v 1.10 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -138,7 +138,7 @@ static GLboolean run_lighting( GLcontext *ctx, struct gl_pipeline_stage *stage )
 	    ASSERT((input->flags & VEC_NOT_WRITEABLE) == 0);
 	 }
 
-	 gl_vector4f_clean_elem(input, VB->Count, 2);
+	 _mesa_vector4f_clean_elem(input, VB->Count, 2);
       }
    }
       
@@ -191,7 +191,7 @@ static GLboolean run_validate_lighting( GLcontext *ctx,
 
    /* This and the above should only be done on _NEW_LIGHT:
     */
-   gl_validate_all_lighting_tables( ctx );
+   _mesa_validate_all_lighting_tables( ctx );
 
    /* Now run the stage...
     */
@@ -218,12 +218,12 @@ static GLboolean run_init_lighting( GLcontext *ctx,
     */
    init_lighting();
 
-   gl_vector4chan_alloc( &store->LitColor[0], 0, size, 32 );
-   gl_vector4chan_alloc( &store->LitColor[1], 0, size, 32 );
-   gl_vector4chan_alloc( &store->LitSecondary[0], 0, size, 32 );
-   gl_vector4chan_alloc( &store->LitSecondary[1], 0, size, 32 );
-   gl_vector1ui_alloc( &store->LitIndex[0], 0, size, 32 );
-   gl_vector1ui_alloc( &store->LitIndex[1], 0, size, 32 );
+   _mesa_vector4chan_alloc( &store->LitColor[0], 0, size, 32 );
+   _mesa_vector4chan_alloc( &store->LitColor[1], 0, size, 32 );
+   _mesa_vector4chan_alloc( &store->LitSecondary[0], 0, size, 32 );
+   _mesa_vector4chan_alloc( &store->LitSecondary[1], 0, size, 32 );
+   _mesa_vector1ui_alloc( &store->LitIndex[0], 0, size, 32 );
+   _mesa_vector1ui_alloc( &store->LitIndex[1], 0, size, 32 );
 
    /* Now validate the stage derived data...
     */
@@ -261,12 +261,12 @@ static void dtr( struct gl_pipeline_stage *stage )
    struct light_stage_data *store = LIGHT_STAGE_DATA(stage);
 
    if (store) {
-      gl_vector4chan_free( &store->LitColor[0] );      
-      gl_vector4chan_free( &store->LitColor[1] );      
-      gl_vector4chan_free( &store->LitSecondary[0] );  
-      gl_vector4chan_free( &store->LitSecondary[1] );  
-      gl_vector1ui_free( &store->LitIndex[0] );      
-      gl_vector1ui_free( &store->LitIndex[1] );      
+      _mesa_vector4chan_free( &store->LitColor[0] );      
+      _mesa_vector4chan_free( &store->LitColor[1] );      
+      _mesa_vector4chan_free( &store->LitSecondary[0] );  
+      _mesa_vector4chan_free( &store->LitSecondary[1] );  
+      _mesa_vector1ui_free( &store->LitIndex[0] );      
+      _mesa_vector1ui_free( &store->LitIndex[1] );      
       FREE( store );
       stage->private = 0;
    }
diff --git a/src/mesa/tnl/t_vb_lighttmp.h b/src/mesa/tnl/t_vb_lighttmp.h
index b9b50219b32..370061512f1 100644
--- a/src/mesa/tnl/t_vb_lighttmp.h
+++ b/src/mesa/tnl/t_vb_lighttmp.h
@@ -1,4 +1,4 @@
-/* $Id: t_vb_lighttmp.h,v 1.8 2001/02/16 18:14:42 keithw Exp $ */
+/* $Id: t_vb_lighttmp.h,v 1.9 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -142,13 +142,13 @@ static void TAG(light_rgba_spec)( GLcontext *ctx,
       struct gl_light *light;
 	 
       if ( CHECK_COLOR_MATERIAL(j) ) 
-	 gl_update_color_material( ctx, CMcolor[j] );
+	 _mesa_update_color_material( ctx, CMcolor[j] );
 
       if ( CHECK_MATERIAL(j) )
-	 gl_update_material( ctx, new_material[j], new_material_mask[j] );
+	 _mesa_update_material( ctx, new_material[j], new_material_mask[j] );
 
       if ( CHECK_VALIDATE(j) )
-	 gl_validate_all_lighting_tables( ctx );
+	 _mesa_validate_all_lighting_tables( ctx );
 
       COPY_3V(sum[0], base[0]);
       ZERO_3V(spec[0]);
@@ -336,13 +336,13 @@ static void TAG(light_rgba)( GLcontext *ctx,
       struct gl_light *light;
 
       if ( CHECK_COLOR_MATERIAL(j) ) 
-	 gl_update_color_material( ctx, (GLchan *)CMcolor[j] );
+	 _mesa_update_color_material( ctx, (GLchan *)CMcolor[j] );
 	 
       if ( CHECK_MATERIAL(j) )
-	 gl_update_material( ctx, new_material[j], new_material_mask[j] );
+	 _mesa_update_material( ctx, new_material[j], new_material_mask[j] );
 
       if ( CHECK_VALIDATE(j) )
-	 gl_validate_all_lighting_tables( ctx );
+	 _mesa_validate_all_lighting_tables( ctx );
 
       COPY_3V(sum[0], base[0]);
       
@@ -527,13 +527,13 @@ static void TAG(light_fast_rgba_single)( GLcontext *ctx,
    do {
 
       if ( CHECK_COLOR_MATERIAL(j) ) 
-	 gl_update_color_material( ctx, (GLchan *)CMcolor[j] );
+	 _mesa_update_color_material( ctx, (GLchan *)CMcolor[j] );
       
       if ( CHECK_MATERIAL(j) ) 
-	 gl_update_material( ctx, new_material[j], new_material_mask[j] );
+	 _mesa_update_material( ctx, new_material[j], new_material_mask[j] );
 
       if ( CHECK_VALIDATE(j) )
-	 gl_validate_all_lighting_tables( ctx );
+	 _mesa_validate_all_lighting_tables( ctx );
 
       baseubyte[0][3] = ctx->Light._BaseAlpha[0];
       baseubyte[1][3] = ctx->Light._BaseAlpha[1];
@@ -646,13 +646,13 @@ static void TAG(light_fast_rgba)( GLcontext *ctx,
 	 GLfloat sum[2][3];
 
 	 if ( CHECK_COLOR_MATERIAL(j) ) 
-	    gl_update_color_material( ctx, CMcolor[j] );
+	    _mesa_update_color_material( ctx, CMcolor[j] );
 
 	 if ( CHECK_MATERIAL(j) ) 
-	    gl_update_material( ctx, new_material[j], new_material_mask[j] );
+	    _mesa_update_material( ctx, new_material[j], new_material_mask[j] );
 
 	 if ( CHECK_VALIDATE(j) )
-	    gl_validate_all_lighting_tables( ctx );
+	    _mesa_validate_all_lighting_tables( ctx );
 
 
 	 COPY_3V(sum[0], ctx->Light._BaseColor[0]);
@@ -778,13 +778,13 @@ static void TAG(light_ci)( GLcontext *ctx,
       struct gl_light *light;
 	 
       if ( CHECK_COLOR_MATERIAL(j) ) 
-	 gl_update_color_material( ctx, (GLchan *)CMcolor[j] );
+	 _mesa_update_color_material( ctx, (GLchan *)CMcolor[j] );
 	 
       if ( CHECK_MATERIAL(j) )
-	 gl_update_material( ctx, new_material[j], new_material_mask[j] );
+	 _mesa_update_material( ctx, new_material[j], new_material_mask[j] );
 
       if ( CHECK_VALIDATE(j) )
-	 gl_validate_all_lighting_tables( ctx );
+	 _mesa_validate_all_lighting_tables( ctx );
 
       diffuse[0] = specular[0] = 0.0F;
 
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index 8c33d244425..91479a38d1b 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.3 2001/02/15 01:33:52 keithw Exp $ */
+/* $Id: t_vb_normals.c,v 1.4 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -146,7 +146,7 @@ static GLboolean alloc_normal_data( GLcontext *ctx,
    if (!store)
       return GL_FALSE;
 
-   gl_vector3f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
+   _mesa_vector3f_alloc( &store->normal, 0, tnl->vb.Size, 32 );
 
    /* Now run the stage.
     */
@@ -160,7 +160,7 @@ static void free_normal_data( struct gl_pipeline_stage *stage )
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
    if (store) {
-      gl_vector3f_free( &store->normal );
+      _mesa_vector3f_free( &store->normal );
       FREE( store );
       stage->private = 0;
    }
diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index 16f9ca9722f..94a9dc27a31 100644
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_points.c,v 1.1 2000/12/26 05:09:33 keithw Exp $ */
+/* $Id: t_vb_points.c,v 1.2 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -89,7 +89,7 @@ static GLboolean alloc_point_data( GLcontext *ctx,
    if (!store)
       return GL_FALSE;
 
-   gl_vector1f_alloc( &store->PointSize, 0, VB->Size, 32 );
+   _mesa_vector1f_alloc( &store->PointSize, 0, VB->Size, 32 );
 
    /* Now run the stage.
     */
@@ -102,7 +102,7 @@ static void free_point_data( struct gl_pipeline_stage *stage )
 {
    struct point_stage_data *store = POINT_STAGE_DATA(stage);
    if (store) {
-      gl_vector1f_free( &store->PointSize );
+      _mesa_vector1f_free( &store->PointSize );
       FREE( store );
       stage->private = 0;
    }
diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index 70c53de7de2..0789670da6e 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.2 2001/01/29 20:47:39 keithw Exp $ */
+/* $Id: t_vb_texgen.c,v 1.3 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -270,7 +270,7 @@ static void texgen_reflection_map_nv( GLcontext *ctx,
       out->count = in->count;
       out->size = MAX2(in->size, 3);
       if (in->size == 4) 
-	 gl_copy_tab[0][0x8](out, in, 0);
+	 _mesa_copy_tab[0][0x8](out, in, 0);
    } 
    else {
       out->flags |= VEC_SIZE_3;
@@ -307,7 +307,7 @@ static void texgen_normal_map_nv( GLcontext *ctx,
       out->count = in->count;
       out->size = MAX2(in->size, 3);
       if (in->size == 4) 
-	 gl_copy_tab[0][0x8](out, in, 0);
+	 _mesa_copy_tab[0][0x8](out, in, 0);
    } 
    else {
       out->flags |= VEC_SIZE_3;
@@ -345,7 +345,7 @@ static void texgen_sphere_map( GLcontext *ctx,
       out->count = in->count;
       out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2;
       if (in->size > 2) 
-	 gl_copy_tab[0][all_bits[in->size] & ~0x3](out, in, 0);
+	 _mesa_copy_tab[0][all_bits[in->size] & ~0x3](out, in, 0);
    } else {
       out->size = 2;
       out->flags |= VEC_SIZE_2;
@@ -394,7 +394,7 @@ static void texgen( GLcontext *ctx,
    else {
       GLuint copy = (all_bits[in->size] & ~texUnit->TexGenEnabled);
       if (copy)
-	 gl_copy_tab[0][copy](out, in, 0);
+	 _mesa_copy_tab[0][copy](out, in, 0);
 
       out->size = MAX2(in->size, store->TexgenSize[unit]);
       out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled;
@@ -404,9 +404,9 @@ static void texgen( GLcontext *ctx,
    }
 
    if (holes) {
-      if (holes & VEC_DIRTY_2) gl_vector4f_clean_elem(out, count, 2);
-      if (holes & VEC_DIRTY_1) gl_vector4f_clean_elem(out, count, 1);
-      if (holes & VEC_DIRTY_0) gl_vector4f_clean_elem(out, count, 0);
+      if (holes & VEC_DIRTY_2) _mesa_vector4f_clean_elem(out, count, 2);
+      if (holes & VEC_DIRTY_1) _mesa_vector4f_clean_elem(out, count, 1);
+      if (holes & VEC_DIRTY_0) _mesa_vector4f_clean_elem(out, count, 0);
    }
 
    if (texUnit->TexGenEnabled & S_BIT) {
@@ -438,7 +438,7 @@ static void texgen( GLcontext *ctx,
 	 break;
       }
       default:
-	 gl_problem(ctx, "Bad S texgen");
+	 _mesa_problem(ctx, "Bad S texgen");
       }
    } 
 
@@ -471,7 +471,7 @@ static void texgen( GLcontext *ctx,
 	 break;
       }
       default:
-	 gl_problem(ctx, "Bad T texgen");
+	 _mesa_problem(ctx, "Bad T texgen");
       }
    }
 
@@ -500,7 +500,7 @@ static void texgen( GLcontext *ctx,
 	 break;
       }
       default:
-	 gl_problem(ctx, "Bad R texgen");
+	 _mesa_problem(ctx, "Bad R texgen");
       }
    }
 
@@ -517,7 +517,7 @@ static void texgen( GLcontext *ctx,
 					texUnit->EyePlaneQ, 0);
 	 break;
       default:
-	 gl_problem(ctx, "Bad Q texgen");
+	 _mesa_problem(ctx, "Bad Q texgen");
       }
    }
 }
@@ -646,7 +646,7 @@ static GLboolean alloc_texgen_data( GLcontext *ctx,
       return GL_FALSE;
 
    for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
-      gl_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
 
    store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3);
    store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat));
@@ -667,7 +667,7 @@ static void free_texgen_data( struct gl_pipeline_stage *stage )
    if (store) {
       for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
 	 if (store->texcoord[i].data) 
-	    gl_vector4f_free( &store->texcoord[i] );
+	    _mesa_vector4f_free( &store->texcoord[i] );
 
       
       if (store->tmp_f) FREE( store->tmp_f );
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index ea415a550e3..ca5707f9fff 100644
--- a/src/mesa/tnl/t_vb_texmat.c
+++ b/src/mesa/tnl/t_vb_texmat.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_texmat.c,v 1.1 2000/12/26 05:09:33 keithw Exp $ */
+/* $Id: t_vb_texmat.c,v 1.2 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -110,7 +110,7 @@ static GLboolean alloc_texmat_data( GLcontext *ctx,
       return GL_FALSE;
 
    for (i = 0 ; i < ctx->Const.MaxTextureUnits ; i++)
-      gl_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
+      _mesa_vector4f_alloc( &store->texcoord[i], 0, VB->Size, 32 );
 
    /* Now run the stage.
     */
@@ -127,7 +127,7 @@ static void free_texmat_data( struct gl_pipeline_stage *stage )
    if (store) {
       for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
 	 if (store->texcoord[i].data)
-	    gl_vector4f_free( &store->texcoord[i] );
+	    _mesa_vector4f_free( &store->texcoord[i] );
       FREE( store );
       stage->private = 0;
    }
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index fc351033950..0af2f65f7c8 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.3 2001/01/29 20:47:39 keithw Exp $ */
+/* $Id: t_vb_vertex.c,v 1.4 2001/03/03 20:33:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -176,8 +176,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
 	    VB->ClipPtr = VB->ObjPtr;
 	 }
 	 if (VB->ClipPtr->size == 2) 
-	    gl_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
-	 gl_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
+	    _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
       }
 
       /* Cliptest and perspective divide.  Clip functions must clear
@@ -267,9 +267,9 @@ static GLboolean init_vertex_stage( GLcontext *ctx,
    if (!store)
       return GL_FALSE;
    
-   gl_vector4f_alloc( &store->eye, 0, size, 32 );
-   gl_vector4f_alloc( &store->clip, 0, size, 32 );
-   gl_vector4f_alloc( &store->proj, 0, size, 32 );  
+   _mesa_vector4f_alloc( &store->eye, 0, size, 32 );
+   _mesa_vector4f_alloc( &store->clip, 0, size, 32 );
+   _mesa_vector4f_alloc( &store->proj, 0, size, 32 );  
 
    store->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
 
@@ -290,9 +290,9 @@ static void dtr( struct gl_pipeline_stage *stage )
    struct vertex_stage_data *store = VERTEX_STAGE_DATA(stage);
 
    if (store) {
-      gl_vector4f_free( &store->eye );
-      gl_vector4f_free( &store->clip );
-      gl_vector4f_free( &store->proj );
+      _mesa_vector4f_free( &store->eye );
+      _mesa_vector4f_free( &store->clip );
+      _mesa_vector4f_free( &store->proj );
       ALIGN_FREE( store->clipmask );
       FREE(store);
       stage->private = 0;