1 files changed, 16 insertions, 16 deletions

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 1ddd12f3203..806f3e2cd29 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,4 +1,4 @@
-/* $Id: feedback.c,v 1.21 2001/01/23 23:39:36 brianp Exp $ */
+/* $Id: feedback.c,v 1.22 2001/03/03 20:33:27 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -55,15 +55,15 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
    ASSERT_OUTSIDE_BEGIN_END(ctx); 
 
    if (ctx->RenderMode==GL_FEEDBACK) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
       return;
    }
    if (size<0) {
-      gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
       return;
    }
    if (!buffer) {
-      gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
       ctx->Feedback.BufferSize = 0; 
       return;
    }
@@ -90,7 +90,7 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 				FB_TEXTURE);
 	 break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
 	 return;
    }
 
@@ -120,7 +120,7 @@ _mesa_PassThrough( GLfloat token )
 /*
  * Put a vertex into the feedback buffer.
  */
-void gl_feedback_vertex( GLcontext *ctx,
+void _mesa_feedback_vertex( GLcontext *ctx,
                          const GLfloat win[4],
 			 const GLfloat color[4],
 			 GLuint index,
@@ -167,7 +167,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (ctx->RenderMode==GL_SELECT) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
       return;			/* KW: added return */
    }
 
@@ -189,7 +189,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
 
 
 
-void gl_update_hitflag( GLcontext *ctx, GLfloat z )
+void _mesa_update_hitflag( GLcontext *ctx, GLfloat z )
 {
    ctx->Select.HitFlag = GL_TRUE;
    if (z < ctx->Select.HitMinZ) {
@@ -259,7 +259,7 @@ _mesa_LoadName( GLuint name )
       return;
    }
    if (ctx->Select.NameStackDepth == 0) {
-      gl_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
       return;
    }
 
@@ -292,7 +292,7 @@ _mesa_PushName( GLuint name )
       write_hit_record( ctx );
    }
    if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {
-      gl_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
    }
    else
       ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
@@ -315,7 +315,7 @@ _mesa_PopName( void )
       write_hit_record( ctx );
    }
    if (ctx->Select.NameStackDepth == 0) {
-      gl_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
    }
    else
       ctx->Select.NameStackDepth--;
@@ -340,7 +340,7 @@ _mesa_RenderMode( GLenum mode )
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
    if (MESA_VERBOSE & VERBOSE_API)
-      fprintf(stderr, "glRenderMode %s\n", gl_lookup_enum_by_nr(mode));
+      fprintf(stderr, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));
 
    FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
    ctx->_TriangleCaps &= ~(DD_FEEDBACK|DD_SELECT);
@@ -378,7 +378,7 @@ _mesa_RenderMode( GLenum mode )
 	 ctx->Feedback.Count = 0;
 	 break;
       default:
-	 gl_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
 	 return 0;
    }
 
@@ -389,18 +389,18 @@ _mesa_RenderMode( GLenum mode )
 	 ctx->_TriangleCaps |= DD_SELECT;
 	 if (ctx->Select.BufferSize==0) {
 	    /* haven't called glSelectBuffer yet */
-	    gl_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
 	 }
 	 break;
       case GL_FEEDBACK:
 	 ctx->_TriangleCaps |= DD_FEEDBACK;
 	 if (ctx->Feedback.BufferSize==0) {
 	    /* haven't called glFeedbackBuffer yet */
-	    gl_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
 	 }
 	 break;
       default:
-	 gl_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
 	 return 0;
    }