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

9 files changed, 117 insertions, 117 deletions

diff --git a/src/mesa/math/m_clip_tmp.h b/src/mesa/math/m_clip_tmp.h
index 87571541989..62c7e37ae90 100644
--- a/src/mesa/math/m_clip_tmp.h
+++ b/src/mesa/math/m_clip_tmp.h
@@ -1,10 +1,10 @@
-/* $Id: m_clip_tmp.h,v 1.3 2001/01/13 05:48:25 keithw Exp $ */
+/* $Id: m_clip_tmp.h,v 1.4 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.5
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -36,10 +36,10 @@
  * and an asm implementation needn't replicate that behaviour.
  */
 static GLvector4f * _XFORMAPI TAG(cliptest_points4)( GLvector4f *clip_vec, 
-					   GLvector4f *proj_vec, 
-					   GLubyte clipMask[],
-					   GLubyte *orMask, 
-					   GLubyte *andMask )
+                                                     GLvector4f *proj_vec, 
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask, 
+                                                     GLubyte *andMask )
 {
    const GLuint stride = clip_vec->stride;
    const GLfloat *from = (GLfloat *)clip_vec->start;
@@ -154,10 +154,10 @@ static GLvector4f * _XFORMAPI TAG(cliptest_np_points4)( GLvector4f *clip_vec,
 
 
 static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec, 
-					   GLvector4f *proj_vec, 
-					   GLubyte clipMask[],
-					   GLubyte *orMask, 
-					   GLubyte *andMask )
+                                                     GLvector4f *proj_vec, 
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask, 
+                                                     GLubyte *andMask )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
@@ -187,10 +187,10 @@ static GLvector4f * _XFORMAPI TAG(cliptest_points3)( GLvector4f *clip_vec,
 
 
 static GLvector4f * _XFORMAPI TAG(cliptest_points2)( GLvector4f *clip_vec, 
-					   GLvector4f *proj_vec, 
-					   GLubyte clipMask[],
-					   GLubyte *orMask, 
-					   GLubyte *andMask )
+                                                     GLvector4f *proj_vec, 
+                                                     GLubyte clipMask[],
+                                                     GLubyte *orMask, 
+                                                     GLubyte *andMask )
 {
    const GLuint stride = clip_vec->stride;
    const GLuint count = clip_vec->count;
diff --git a/src/mesa/math/m_copy_tmp.h b/src/mesa/math/m_copy_tmp.h
index 3119b95589b..755536f3e20 100644
--- a/src/mesa/math/m_copy_tmp.h
+++ b/src/mesa/math/m_copy_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_copy_tmp.h,v 1.2 2000/12/26 05:09:31 keithw Exp $ */
+/* $Id: m_copy_tmp.h,v 1.3 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -72,20 +72,20 @@ COPY_FUNC( 0xf )
 
 static void TAG2(init_copy, 0 ) ( void )
 {
-   gl_copy_tab[IDX][0x0] = TAG2(copy, 0x0);
-   gl_copy_tab[IDX][0x1] = TAG2(copy, 0x1);
-   gl_copy_tab[IDX][0x2] = TAG2(copy, 0x2);
-   gl_copy_tab[IDX][0x3] = TAG2(copy, 0x3);
-   gl_copy_tab[IDX][0x4] = TAG2(copy, 0x4);
-   gl_copy_tab[IDX][0x5] = TAG2(copy, 0x5);
-   gl_copy_tab[IDX][0x6] = TAG2(copy, 0x6);
-   gl_copy_tab[IDX][0x7] = TAG2(copy, 0x7);
-   gl_copy_tab[IDX][0x8] = TAG2(copy, 0x8);
-   gl_copy_tab[IDX][0x9] = TAG2(copy, 0x9);
-   gl_copy_tab[IDX][0xa] = TAG2(copy, 0xa);
-   gl_copy_tab[IDX][0xb] = TAG2(copy, 0xb);
-   gl_copy_tab[IDX][0xc] = TAG2(copy, 0xc);
-   gl_copy_tab[IDX][0xd] = TAG2(copy, 0xd);
-   gl_copy_tab[IDX][0xe] = TAG2(copy, 0xe);
-   gl_copy_tab[IDX][0xf] = TAG2(copy, 0xf);
+   _mesa_copy_tab[IDX][0x0] = TAG2(copy, 0x0);
+   _mesa_copy_tab[IDX][0x1] = TAG2(copy, 0x1);
+   _mesa_copy_tab[IDX][0x2] = TAG2(copy, 0x2);
+   _mesa_copy_tab[IDX][0x3] = TAG2(copy, 0x3);
+   _mesa_copy_tab[IDX][0x4] = TAG2(copy, 0x4);
+   _mesa_copy_tab[IDX][0x5] = TAG2(copy, 0x5);
+   _mesa_copy_tab[IDX][0x6] = TAG2(copy, 0x6);
+   _mesa_copy_tab[IDX][0x7] = TAG2(copy, 0x7);
+   _mesa_copy_tab[IDX][0x8] = TAG2(copy, 0x8);
+   _mesa_copy_tab[IDX][0x9] = TAG2(copy, 0x9);
+   _mesa_copy_tab[IDX][0xa] = TAG2(copy, 0xa);
+   _mesa_copy_tab[IDX][0xb] = TAG2(copy, 0xb);
+   _mesa_copy_tab[IDX][0xc] = TAG2(copy, 0xc);
+   _mesa_copy_tab[IDX][0xd] = TAG2(copy, 0xd);
+   _mesa_copy_tab[IDX][0xe] = TAG2(copy, 0xe);
+   _mesa_copy_tab[IDX][0xf] = TAG2(copy, 0xf);
 }
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index 9515072dc6b..3c37760032a 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.1 2001/02/03 08:41:04 gareth Exp $ */
+/* $Id: m_debug_norm.c,v 1.2 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -384,7 +384,7 @@ void _math_test_all_normal_transform_functions( char *description )
             char buf[100];
             sprintf( buf, "gl_normal_tab[%s][%s] failed test (%s)",
                      cmastring, norm_strings[mtype], description );
-            gl_problem( NULL, buf );
+            _mesa_problem( NULL, buf );
 	 }
 
 #ifdef RUN_DEBUG_BENCHMARK
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index 49bbd9a830b..8b26a233b43 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -1,4 +1,4 @@
-/* $Id: m_debug_xform.c,v 1.2 2001/02/03 08:41:04 gareth Exp $ */
+/* $Id: m_debug_xform.c,v 1.3 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -174,7 +174,7 @@ static int test_transform_function( transform_func func, int psize, int mtype,
    (void) cycles;
 
    if ( psize > 4 ) {
-      gl_problem( NULL, "test_transform_function called with psize > 4\n" );
+      _mesa_problem( NULL, "test_transform_function called with psize > 4\n" );
       return 0;
    }
 
@@ -321,15 +321,15 @@ void _math_test_all_transform_functions( char *description )
 
       for ( mtype = 0 ; mtype < 7 ; mtype++ ) {
          for ( psize = 1 ; psize <= 4 ; psize++ ) {
-            transform_func func = gl_transform_tab[cma][psize][mtypes[mtype]];
+            transform_func func = _mesa_transform_tab[cma][psize][mtypes[mtype]];
             long *cycles = &(benchmark_tab[cma][psize-1][mtype]);
 
             if ( test_transform_function( func, psize, mtype,
 					  masked, cycles ) == 0 ) {
                char buf[100];
-               sprintf( buf, "gl_transform_tab[%s][%d][%s] failed test (%s)",
+               sprintf( buf, "_mesa_transform_tab[%s][%d][%s] failed test (%s)",
                         cmastring, psize, mstrings[mtype], description );
-               gl_problem( NULL, buf );
+               _mesa_problem( NULL, buf );
             }
 #ifdef RUN_DEBUG_BENCHMARK
             if ( mesa_profile )
diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index 02a558ac380..2cb227594d0 100644
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -1,4 +1,4 @@
-/* $Id: m_vector.c,v 1.4 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: m_vector.c,v 1.5 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -41,7 +41,7 @@
  * Given a vector [count][4] of floats, set all the [][elt] values
  * to 0 (if elt = 0, 1, 2) or 1.0 (if elt = 3).
  */
-void gl_vector4f_clean_elem( GLvector4f *vec, GLuint count, GLuint elt )
+void _mesa_vector4f_clean_elem( GLvector4f *vec, GLuint count, GLuint elt )
 {
    static const GLubyte elem_bits[4] = {
       VEC_DIRTY_0,
@@ -78,7 +78,7 @@ static const GLubyte size_bits[5] = {
  */
 
 
-void gl_vector4f_init( GLvector4f *v, GLuint flags, GLfloat (*storage)[4] )
+void _mesa_vector4f_init( GLvector4f *v, GLuint flags, GLfloat (*storage)[4] )
 {
    v->stride = 4 * sizeof(GLfloat);
    v->size = 2;   /* may change: 2-4 for vertices and 1-4 for texcoords */
@@ -88,7 +88,7 @@ void gl_vector4f_init( GLvector4f *v, GLuint flags, GLfloat (*storage)[4] )
    v->flags = size_bits[4] | flags ;
 }
 
-void gl_vector3f_init( GLvector3f *v, GLuint flags, GLfloat (*storage)[3] )
+void _mesa_vector3f_init( GLvector3f *v, GLuint flags, GLfloat (*storage)[3] )
 {
    v->stride = 3 * sizeof(GLfloat);
    v->data = storage;
@@ -97,7 +97,7 @@ void gl_vector3f_init( GLvector3f *v, GLuint flags, GLfloat (*storage)[3] )
    v->flags = flags ;
 }
 
-void gl_vector1f_init( GLvector1f *v, GLuint flags, GLfloat *storage )
+void _mesa_vector1f_init( GLvector1f *v, GLuint flags, GLfloat *storage )
 {
    v->stride = 1*sizeof(GLfloat);
    v->data = storage;
@@ -106,7 +106,7 @@ void gl_vector1f_init( GLvector1f *v, GLuint flags, GLfloat *storage )
    v->flags = flags ;
 }
 
-void gl_vector4ub_init( GLvector4ub *v, GLuint flags, GLubyte (*storage)[4] )
+void _mesa_vector4ub_init( GLvector4ub *v, GLuint flags, GLubyte (*storage)[4] )
 {
    v->stride = 4 * sizeof(GLubyte);
    v->data = storage;
@@ -115,7 +115,7 @@ void gl_vector4ub_init( GLvector4ub *v, GLuint flags, GLubyte (*storage)[4] )
    v->flags = flags ;
 }
 
-void gl_vector4chan_init( GLvector4chan *v, GLuint flags, GLchan (*storage)[4] )
+void _mesa_vector4chan_init( GLvector4chan *v, GLuint flags, GLchan (*storage)[4] )
 {
    v->stride = 4 * sizeof(GLchan);
    v->data = storage;
@@ -124,7 +124,7 @@ void gl_vector4chan_init( GLvector4chan *v, GLuint flags, GLchan (*storage)[4] )
    v->flags = flags ;
 }
 
-void gl_vector4us_init( GLvector4us *v, GLuint flags, GLushort (*storage)[4] )
+void _mesa_vector4us_init( GLvector4us *v, GLuint flags, GLushort (*storage)[4] )
 {
    v->stride = 4 * sizeof(GLushort);
    v->data = storage;
@@ -133,7 +133,7 @@ void gl_vector4us_init( GLvector4us *v, GLuint flags, GLushort (*storage)[4] )
    v->flags = flags ;
 }
 
-void gl_vector1ub_init( GLvector1ub *v, GLuint flags, GLubyte *storage )
+void _mesa_vector1ub_init( GLvector1ub *v, GLuint flags, GLubyte *storage )
 {
    v->stride = 1 * sizeof(GLubyte);
    v->data = storage;
@@ -142,7 +142,7 @@ void gl_vector1ub_init( GLvector1ub *v, GLuint flags, GLubyte *storage )
    v->flags = flags ;
 }
 
-void gl_vector1ui_init( GLvector1ui *v, GLuint flags, GLuint *storage )
+void _mesa_vector1ui_init( GLvector1ui *v, GLuint flags, GLuint *storage )
 {
    v->stride = 1 * sizeof(GLuint);
    v->data = storage;
@@ -162,7 +162,7 @@ void gl_vector1ui_init( GLvector1ui *v, GLuint flags, GLuint *storage )
  */
 
 
-void gl_vector4f_alloc( GLvector4f *v, GLuint flags, GLuint count,
+void _mesa_vector4f_alloc( GLvector4f *v, GLuint flags, GLuint count,
 			GLuint alignment )
 {
    v->stride = 4 * sizeof(GLfloat);
@@ -174,7 +174,7 @@ void gl_vector4f_alloc( GLvector4f *v, GLuint flags, GLuint count,
    v->flags = size_bits[4] | flags | VEC_MALLOC ;
 }
 
-void gl_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
+void _mesa_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
 			GLuint alignment )
 {
    v->stride = 3 * sizeof(GLfloat);
@@ -185,7 +185,7 @@ void gl_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector1f_alloc( GLvector1f *v, GLuint flags, GLuint count,
+void _mesa_vector1f_alloc( GLvector1f *v, GLuint flags, GLuint count,
 			GLuint alignment )
 {
    v->stride = sizeof(GLfloat);
@@ -196,7 +196,7 @@ void gl_vector1f_alloc( GLvector1f *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
+void _mesa_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
 			 GLuint alignment )
 {
    v->stride = 4 * sizeof(GLubyte);
@@ -207,7 +207,7 @@ void gl_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector4chan_alloc( GLvector4chan *v, GLuint flags, GLuint count,
+void _mesa_vector4chan_alloc( GLvector4chan *v, GLuint flags, GLuint count,
 			   GLuint alignment )
 {
    v->stride = 4 * sizeof(GLchan);
@@ -218,7 +218,7 @@ void gl_vector4chan_alloc( GLvector4chan *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector4us_alloc( GLvector4us *v, GLuint flags, GLuint count,
+void _mesa_vector4us_alloc( GLvector4us *v, GLuint flags, GLuint count,
                          GLuint alignment )
 {
    v->stride = 4 * sizeof(GLushort);
@@ -229,7 +229,7 @@ void gl_vector4us_alloc( GLvector4us *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
+void _mesa_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
 			 GLuint alignment )
 {
    v->stride = 1 * sizeof(GLubyte);
@@ -240,7 +240,7 @@ void gl_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
    v->flags = flags | VEC_MALLOC ;
 }
 
-void gl_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count,
+void _mesa_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count,
 			 GLuint alignment )
 {
    v->stride = 1 * sizeof(GLuint);
@@ -260,7 +260,7 @@ void gl_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count,
  */
 
 
-void gl_vector4f_free( GLvector4f *v )
+void _mesa_vector4f_free( GLvector4f *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -271,7 +271,7 @@ void gl_vector4f_free( GLvector4f *v )
    }
 }
 
-void gl_vector3f_free( GLvector3f *v )
+void _mesa_vector3f_free( GLvector3f *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -282,7 +282,7 @@ void gl_vector3f_free( GLvector3f *v )
    }
 }
 
-void gl_vector1f_free( GLvector1f *v )
+void _mesa_vector1f_free( GLvector1f *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -293,7 +293,7 @@ void gl_vector1f_free( GLvector1f *v )
    }
 }
 
-void gl_vector4ub_free( GLvector4ub *v )
+void _mesa_vector4ub_free( GLvector4ub *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -304,7 +304,7 @@ void gl_vector4ub_free( GLvector4ub *v )
    }
 }
 
-void gl_vector4chan_free( GLvector4chan *v )
+void _mesa_vector4chan_free( GLvector4chan *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -315,7 +315,7 @@ void gl_vector4chan_free( GLvector4chan *v )
    }
 }
 
-void gl_vector4us_free( GLvector4us *v )
+void _mesa_vector4us_free( GLvector4us *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -326,7 +326,7 @@ void gl_vector4us_free( GLvector4us *v )
    }
 }
 
-void gl_vector1ub_free( GLvector1ub *v )
+void _mesa_vector1ub_free( GLvector1ub *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -337,7 +337,7 @@ void gl_vector1ub_free( GLvector1ub *v )
    }
 }
 
-void gl_vector1ui_free( GLvector1ui *v )
+void _mesa_vector1ui_free( GLvector1ui *v )
 {
    if (v->flags & VEC_MALLOC) {
       ALIGN_FREE( v->storage );
@@ -352,7 +352,7 @@ void gl_vector1ui_free( GLvector1ui *v )
 /*
  * For debugging
  */
-void gl_vector4f_print( GLvector4f *v, GLubyte *cullmask, GLboolean culling )
+void _mesa_vector4f_print( GLvector4f *v, GLubyte *cullmask, GLboolean culling )
 {
    GLfloat c[4] = { 0, 0, 0, 1 };
    const char *templates[5] = {
@@ -405,7 +405,7 @@ void gl_vector4f_print( GLvector4f *v, GLubyte *cullmask, GLboolean culling )
 /*
  * For debugging
  */
-void gl_vector3f_print( GLvector3f *v, GLubyte *cullmask, GLboolean culling )
+void _mesa_vector3f_print( GLvector3f *v, GLubyte *cullmask, GLboolean culling )
 {
    GLfloat *d = (GLfloat *)v->data;
    GLuint i = 0, count;
diff --git a/src/mesa/math/m_vector.h b/src/mesa/math/m_vector.h
index fc51b2006c9..0615d3056ff 100644
--- a/src/mesa/math/m_vector.h
+++ b/src/mesa/math/m_vector.h
@@ -1,4 +1,4 @@
-/* $Id: m_vector.h,v 1.4 2001/02/20 18:28:52 keithw Exp $ */
+/* $Id: m_vector.h,v 1.5 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -58,7 +58,7 @@
  * because they contain non-(0,0,0,1) values.  
  *
  * The start field is used to reserve data for copied vertices at the
- * end of gl_transform_vb, and avoids the need for a multiplication in
+ * end of _mesa_transform_vb, and avoids the need for a multiplication in
  * the transformation routines.
  */
 typedef struct {
@@ -72,13 +72,13 @@ typedef struct {
 } GLvector4f;
 
 
-extern void gl_vector4f_init( GLvector4f *v, GLuint flags,
+extern void _mesa_vector4f_init( GLvector4f *v, GLuint flags,
 			      GLfloat (*storage)[4] );
-extern void gl_vector4f_alloc( GLvector4f *v, GLuint flags,
+extern void _mesa_vector4f_alloc( GLvector4f *v, GLuint flags,
 			       GLuint count, GLuint alignment );
-extern void gl_vector4f_free( GLvector4f *v );
-extern void gl_vector4f_print( GLvector4f *v, GLubyte *, GLboolean );
-extern void gl_vector4f_clean_elem( GLvector4f *vec, GLuint nr, GLuint elt );
+extern void _mesa_vector4f_free( GLvector4f *v );
+extern void _mesa_vector4f_print( GLvector4f *v, GLubyte *, GLboolean );
+extern void _mesa_vector4f_clean_elem( GLvector4f *vec, GLuint nr, GLuint elt );
 
 
 /* Could use a single vector type for normals and vertices, but
@@ -93,11 +93,11 @@ typedef struct {
    void *storage;
 } GLvector3f;
 
-extern void gl_vector3f_init( GLvector3f *v, GLuint flags, GLfloat (*)[3] );
-extern void gl_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
+extern void _mesa_vector3f_init( GLvector3f *v, GLuint flags, GLfloat (*)[3] );
+extern void _mesa_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
 			       GLuint alignment );
-extern void gl_vector3f_free( GLvector3f *v );
-extern void gl_vector3f_print( GLvector3f *v, GLubyte *, GLboolean );
+extern void _mesa_vector3f_free( GLvector3f *v );
+extern void _mesa_vector3f_print( GLvector3f *v, GLubyte *, GLboolean );
 
 
 typedef struct {
@@ -109,9 +109,9 @@ typedef struct {
    void *storage;
 } GLvector1f;
 
-extern void gl_vector1f_free( GLvector1f *v );
-extern void gl_vector1f_init( GLvector1f *v, GLuint flags, GLfloat * );
-extern void gl_vector1f_alloc( GLvector1f *v, GLuint flags, GLuint count,
+extern void _mesa_vector1f_free( GLvector1f *v );
+extern void _mesa_vector1f_init( GLvector1f *v, GLuint flags, GLfloat * );
+extern void _mesa_vector1f_alloc( GLvector1f *v, GLuint flags, GLuint count,
 			       GLuint alignment );
 
 
@@ -126,11 +126,11 @@ typedef struct {
    void *storage;
 } GLvector4ub;
 
-extern void gl_vector4ub_init( GLvector4ub *v, GLuint flags, 
+extern void _mesa_vector4ub_init( GLvector4ub *v, GLuint flags, 
 			       GLubyte (*storage)[4] );
-extern void gl_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
+extern void _mesa_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
 				GLuint alignment );
-extern void gl_vector4ub_free( GLvector4ub * );
+extern void _mesa_vector4ub_free( GLvector4ub * );
 
 
 /* For 4 * GLchan values.
@@ -144,11 +144,11 @@ typedef struct {
    void *storage;
 } GLvector4chan;
 
-extern void gl_vector4chan_init( GLvector4chan *v, GLuint flags, 
+extern void _mesa_vector4chan_init( GLvector4chan *v, GLuint flags, 
 				 GLchan (*storage)[4] );
-extern void gl_vector4chan_alloc( GLvector4chan *v, GLuint flags, GLuint count,
+extern void _mesa_vector4chan_alloc( GLvector4chan *v, GLuint flags, GLuint count,
 				  GLuint alignment );
-extern void gl_vector4chan_free( GLvector4chan * );
+extern void _mesa_vector4chan_free( GLvector4chan * );
 
 
 
@@ -164,11 +164,11 @@ typedef struct {
    void *storage;
 } GLvector4us;
 
-extern void gl_vector4us_init( GLvector4us *v, GLuint flags, 
+extern void _mesa_vector4us_init( GLvector4us *v, GLuint flags, 
                                GLushort (*storage)[4] );
-extern void gl_vector4us_alloc( GLvector4us *v, GLuint flags, GLuint count,
+extern void _mesa_vector4us_alloc( GLvector4us *v, GLuint flags, GLuint count,
                                 GLuint alignment );
-extern void gl_vector4us_free( GLvector4us * );
+extern void _mesa_vector4us_free( GLvector4us * );
 
 
 
@@ -184,10 +184,10 @@ typedef struct {
    void *storage;
 } GLvector1ub;
 
-extern void gl_vector1ub_init( GLvector1ub *v, GLuint flags, GLubyte *storage);
-extern void gl_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
+extern void _mesa_vector1ub_init( GLvector1ub *v, GLuint flags, GLubyte *storage);
+extern void _mesa_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
 				GLuint alignment );
-extern void gl_vector1ub_free( GLvector1ub * );
+extern void _mesa_vector1ub_free( GLvector1ub * );
 
 
 
@@ -203,10 +203,10 @@ typedef struct {
    void *storage;
 } GLvector1ui;
 
-extern void gl_vector1ui_init( GLvector1ui *v, GLuint flags, GLuint *storage );
-extern void gl_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count, 
+extern void _mesa_vector1ui_init( GLvector1ui *v, GLuint flags, GLuint *storage );
+extern void _mesa_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count, 
 				GLuint alignment );
-extern void gl_vector1ui_free( GLvector1ui * );
+extern void _mesa_vector1ui_free( GLvector1ui * );
 
 
 
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 9c8fadf7126..3a677ddfe6a 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.8 2001/02/03 08:41:04 gareth Exp $ */
+/* $Id: m_xform.c,v 1.9 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -59,9 +59,9 @@
 clip_func gl_clip_tab[5];
 clip_func gl_clip_np_tab[5];
 dotprod_func gl_dotprod_tab[2][5];
-vec_copy_func gl_copy_tab[2][0x10];
+vec_copy_func _mesa_copy_tab[2][0x10];
 normal_func gl_normal_tab[0xf][0x4];
-transform_func **(gl_transform_tab[2]);
+transform_func **(_mesa_transform_tab[2]);
 static transform_func *cull_transform_tab[5];
 static transform_func *raw_transform_tab[5];
 
@@ -125,7 +125,7 @@ static transform_func *raw_transform_tab[5];
 
 
 
-GLvector4f *gl_project_points( GLvector4f *proj_vec,
+GLvector4f *_mesa_project_points( GLvector4f *proj_vec,
 			       const GLvector4f *clip_vec )
 {
    const GLuint stride = clip_vec->stride;
@@ -163,7 +163,7 @@ GLvector4f *gl_project_points( GLvector4f *proj_vec,
  *         m - transformation matrix
  * Output:  u - transformed vector
  */
-void gl_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
+void _mesa_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16] )
 {
    GLfloat v0=v[0], v1=v[1], v2=v[2], v3=v[3];
 #define M(row,col)  m[row + col*4]
@@ -179,7 +179,7 @@ void gl_transform_vector( GLfloat u[4], const GLfloat v[4], const GLfloat m[16]
  * Note that because the matrix isn't analysed we do too many
  * multiplies, and that the result is always 4-clean.
  */
-void gl_transform_point_sz( GLfloat Q[4], const GLfloat M[16],
+void _mesa_transform_point_sz( GLfloat Q[4], const GLfloat M[16],
 			    const GLfloat P[4], GLuint sz )
 {
    if (Q == P)
@@ -224,8 +224,8 @@ void gl_transform_point_sz( GLfloat Q[4], const GLfloat M[16],
 void
 _math_init_transformation( void )
 {
-   gl_transform_tab[0] = raw_transform_tab;
-   gl_transform_tab[1] = cull_transform_tab;
+   _mesa_transform_tab[0] = raw_transform_tab;
+   _mesa_transform_tab[1] = cull_transform_tab;
 
    init_c_transformations_raw();
    init_c_transformations_masked();
@@ -243,7 +243,7 @@ _math_init_transformation( void )
 #endif
 
 #ifdef USE_X86_ASM
-   gl_init_all_x86_transform_asm();
+   _mesa_init_all_x86_transform_asm();
 #endif
 }
 
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index f6b10d6ad36..27496feb784 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.5 2001/01/13 05:48:25 keithw Exp $ */
+/* $Id: m_xform.h,v 1.6 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -73,7 +73,7 @@ do {								\
 } while (0)
 
 
-extern void gl_transform_vector( GLfloat u[4],
+extern void _mesa_transform_vector( GLfloat u[4],
 				 CONST GLfloat v[4],
                                  CONST GLfloat m[16] );
 
@@ -185,21 +185,21 @@ typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec,
 					  CONST GLubyte flag );
 
 
-extern GLvector4f *gl_project_points( GLvector4f *to,
+extern GLvector4f *_mesa_project_points( GLvector4f *to,
 				      CONST GLvector4f *from );
 
-extern void gl_transform_bounds3( GLubyte *orMask, GLubyte *andMask,
+extern void _mesa_transform_bounds3( GLubyte *orMask, GLubyte *andMask,
 				  CONST GLfloat m[16],
 				  CONST GLfloat src[][3] );
 
-extern void gl_transform_bounds2( GLubyte *orMask, GLubyte *andMask,
+extern void _mesa_transform_bounds2( GLubyte *orMask, GLubyte *andMask,
 				  CONST GLfloat m[16],
 				  CONST GLfloat src[][3] );
 
 
 extern dotprod_func  gl_dotprod_tab[2][5];
-extern vec_copy_func gl_copy_tab[2][0x10];
-extern vec_copy_func gl_copy_clean_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];
@@ -207,15 +207,15 @@ extern normal_func   gl_normal_tab[0xf][0x4];
 /* Use of 3 layers of linked 1-dimensional arrays to reduce
  * cost of lookup.
  */
-extern transform_func **(gl_transform_tab[2]);
+extern transform_func **(_mesa_transform_tab[2]);
 
 
-extern void gl_transform_point_sz( GLfloat Q[4], CONST GLfloat M[16],
+extern void _mesa_transform_point_sz( GLfloat Q[4], CONST GLfloat M[16],
 				   CONST GLfloat P[4], GLuint sz );
 
 
 #define TransformRaw( to, mat, from ) \
-      ( (*gl_transform_tab[0][(from)->size][(mat)->type])( to, (mat)->m, from, 0, 0 ), \
+      ( (*_mesa_transform_tab[0][(from)->size][(mat)->type])( to, (mat)->m, from, 0, 0 ), \
         (to) )
 
 
diff --git a/src/mesa/math/m_xform_tmp.h b/src/mesa/math/m_xform_tmp.h
index cb94f88ed1e..eca41f5f762 100644
--- a/src/mesa/math/m_xform_tmp.h
+++ b/src/mesa/math/m_xform_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_xform_tmp.h,v 1.2 2000/12/26 05:09:31 keithw Exp $ */
+/* $Id: m_xform_tmp.h,v 1.3 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -920,7 +920,7 @@ static transform_func _XFORMAPI TAG(transform_tab_4)[7];
  */
 static void _XFORMAPI TAG(init_c_transformations)( void )
 {
-#define TAG_TAB   gl_transform_tab[IDX]
+#define TAG_TAB   _mesa_transform_tab[IDX]
 #define TAG_TAB_1 TAG(transform_tab_1)
 #define TAG_TAB_2 TAG(transform_tab_2)
 #define TAG_TAB_3 TAG(transform_tab_3)