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

19 files changed, 56 insertions, 47 deletions

diff --git a/src/mesa/drivers/allegro/amesa.c b/src/mesa/drivers/allegro/amesa.c
index 23ce8885096..2585c218d85 100644
--- a/src/mesa/drivers/allegro/amesa.c
+++ b/src/mesa/drivers/allegro/amesa.c
@@ -371,7 +371,7 @@ GLboolean AMesaMakeCurrent(AMesaContext context, AMesaBuffer buffer)
         

       setup_dd_pointers(context->GLContext);

       _mesa_make_current(context->GLContext, buffer->GLBuffer);

-      gl_Viewport(context->GLContext, 0, 0, buffer->Width, buffer->Height);

+      _mesa_set_viewport(context->GLContext, 0, 0, buffer->Width, buffer->Height);

    }

    else {

       destroy_bitmap(context->Buffer->Screen);

diff --git a/src/mesa/drivers/d3d/D3Dvbrender.c b/src/mesa/drivers/d3d/D3Dvbrender.c
index f04b1b4aae4..a3a18323fec 100644
--- a/src/mesa/drivers/d3d/D3Dvbrender.c
+++ b/src/mesa/drivers/d3d/D3Dvbrender.c
@@ -394,7 +394,7 @@ GLboolean RenderVertexBuffer( GLcontext *ctx, GLboolean allDone )
 
     default:
 	 /* should never get here */
-	 gl_problem( ctx, "invalid mode in gl_render_vb" );
+	 _mesa_problem( ctx, "invalid mode in gl_render_vb" );
    }
 
   DPF(( DBG_PRIM_INFO, "ResetVB" ));
diff --git a/src/mesa/drivers/dos/dosmesa.c b/src/mesa/drivers/dos/dosmesa.c
index 89a8c2d616e..6ee7291de10 100644
--- a/src/mesa/drivers/dos/dosmesa.c
+++ b/src/mesa/drivers/dos/dosmesa.c
@@ -1,4 +1,4 @@
-/* $Id: dosmesa.c,v 1.3 2000/11/22 08:55:52 joukj Exp $ */

+/* $Id: dosmesa.c,v 1.4 2001/03/03 20:33:29 brianp Exp $ */

 

 /*

  * Mesa 3-D graphics library

@@ -23,6 +23,9 @@
 

 /*

  * $Log: dosmesa.c,v $
+ * Revision 1.4  2001/03/03 20:33:29  brianp
+ * lots of gl_*() to _mesa_*() namespace clean-up
+ *
  * Revision 1.3  2000/11/22 08:55:52  joukj
  *
  *
@@ -1492,7 +1495,7 @@ void DOSMesaMakeCurrent( DOSMesaContext ctx )
       /* setup initial viewport */

       ctx->width = vga_getxdim();

       ctx->height = vga_getydim();

-      gl_Viewport( ctx->gl_ctx, 0, 0, ctx->width, ctx->height );

+      _mesa_set_viewport( ctx->gl_ctx, 0, 0, ctx->width, ctx->height );

    }

 }

 

diff --git a/src/mesa/drivers/ggi/ggimesa.c b/src/mesa/drivers/ggi/ggimesa.c
index 6bcb2d17cd5..d7928dd243e 100644
--- a/src/mesa/drivers/ggi/ggimesa.c
+++ b/src/mesa/drivers/ggi/ggimesa.c
@@ -534,7 +534,7 @@ void GGIMesaMakeCurrent(GGIMesaContext ctx)
 	
 	if (!ctx->viewport_init)
 	{
-		gl_Viewport(ctx->gl_ctx, 0, 0, ctx->width, ctx->height);
+		_mesa_set_viewport(ctx->gl_ctx, 0, 0, ctx->width, ctx->height);
 		ctx->viewport_init = GL_TRUE;
 	}
 }
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 667f0fd022d..40b1d5d79c1 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -674,7 +674,7 @@ void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext fxMesa)
 
   /* The first time we call MakeCurrent we set the initial viewport size */
   if(fxMesa->glCtx->Viewport.Width==0)
-    gl_Viewport(fxMesa->glCtx,0,0,fxMesa->width,fxMesa->height);
+    _mesa_set_viewport(fxMesa->glCtx,0,0,fxMesa->width,fxMesa->height);
 
   if (MESA_VERBOSE&VERBOSE_DRIVER) {
     fprintf(stderr,"fxmesa: fxMesaMakeCurrent(...) End\n");
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 3378b8162c1..dc7137a9333 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -903,8 +903,8 @@ static GLboolean fxIsInHardware(GLcontext *ctx)
 
     if (MESA_VERBOSE & (VERBOSE_DRIVER|VERBOSE_TEXTURE))
        fprintf(stderr, "fxMesa: fxIsInHardware, envmode is %s/%s\n",
-	       gl_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
-	       gl_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
+	       _mesa_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
+	       _mesa_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
 
     /* KW: This was wrong (I think) and I changed it... which doesn't mean
      * it is now correct...
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 1ded0f4cca5..4c4fb018252 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1000,7 +1000,7 @@ fxDDTexImage2D(GLcontext *ctx, GLenum target, GLint level,
    GLboolean success;
 
    if (!fxIsTexSupported(target, internalFormat, texImage)) {
-      gl_problem(NULL, "fx Driver: unsupported texture in fxDDTexImg()\n");
+      _mesa_problem(NULL, "fx Driver: unsupported texture in fxDDTexImg()\n");
       return;
    }
 
@@ -1112,7 +1112,7 @@ fxDDTexImage2D(GLcontext *ctx, GLenum target, GLint level,
       mesaFormat = MESA_A1_R5_G5_B5;
       break;
    default:
-      gl_problem(NULL, "tdfx driver: texbuildimagemap() bad format");
+      _mesa_problem(NULL, "tdfx driver: texbuildimagemap() bad format");
       return;
    }
 
@@ -1199,7 +1199,7 @@ fxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
    MesaIntTexFormat mesaFormat;
 
    if (!texObj->DriverData) {
-      gl_problem(ctx, "problem in fxDDTexSubImage2D");
+      _mesa_problem(ctx, "problem in fxDDTexSubImage2D");
       return;
    }
 
@@ -1240,7 +1240,7 @@ fxDDTexSubImage2D(GLcontext *ctx, GLenum target, GLint level,
       mesaFormat = MESA_A1_R5_G5_B5;
       break;
    default:
-      gl_problem(NULL, "tdfx driver: fxTexBuildSubImageMap() bad format");
+      _mesa_problem(NULL, "tdfx driver: fxTexBuildSubImageMap() bad format");
       return;
    }
 
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index a5a81dd5972..2e2a71c88ed 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -570,7 +570,7 @@ extern void fxDDTexPalette(GLcontext *, struct gl_texture_object *);
 extern void fxDDTexUseGlbPalette(GLcontext *, GLboolean);
 
 extern void fxDDEnable(GLcontext *, GLenum, GLboolean);
-extern void fxDDAlphaFunc(GLcontext *, GLenum, GLclampf);
+extern void fxDDAlphaFunc(GLcontext *, GLenum, GLchan);
 extern void fxDDBlendFunc(GLcontext *, GLenum, GLenum);
 extern void fxDDDepthMask(GLcontext *, GLboolean);
 extern void fxDDDepthFunc(GLcontext *, GLenum);
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 5b768848ce2..5d844473d81 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -501,7 +501,7 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset)
 
   if (MESA_VERBOSE & (VERBOSE_DRIVER|VERBOSE_TEXTURE))
      fprintf(stderr, "fxMesa: fxSetupTextureSingleTMU, envmode is %s\n",
-	     gl_lookup_enum_by_nr(ctx->Texture.Unit[textureset].EnvMode));
+	     _mesa_lookup_enum_by_nr(ctx->Texture.Unit[textureset].EnvMode));
 
   switch(ctx->Texture.Unit[textureset].EnvMode) {
   case GL_DECAL:
@@ -790,8 +790,8 @@ static void fxSetupTextureDoubleTMU_NoLock(GLcontext *ctx)
 
   if (MESA_VERBOSE & (VERBOSE_DRIVER|VERBOSE_TEXTURE))
      fprintf(stderr, "fxMesa: fxSetupTextureDoubleTMU, envmode is %s/%s\n",
-	     gl_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
-	     gl_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
+	     _mesa_lookup_enum_by_nr(ctx->Texture.Unit[0].EnvMode),
+	     _mesa_lookup_enum_by_nr(ctx->Texture.Unit[1].EnvMode));
 
 
   if ((ti0->whichTMU==FX_TMU1) || (ti1->whichTMU==FX_TMU0)) {
@@ -1253,7 +1253,7 @@ static void fxSetupBlend(GLcontext *ctx)
 /************************** Alpha Test SetUp ****************************/
 /************************************************************************/
 
-void fxDDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
+void fxDDAlphaFunc(GLcontext *ctx, GLenum func, GLchan ref)
 {
   fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx;
   tfxUnitsState *us=&fxMesa->unitsState;
@@ -1296,8 +1296,8 @@ void fxDDAlphaFunc(GLcontext *ctx, GLenum func, GLclampf ref)
     fxMesa->new_state |= FX_NEW_ALPHA;
   }
 
-  if(ctx->Color.AlphaRef!=us->alphaTestRefValue) {
-    us->alphaTestRefValue=ctx->Color.AlphaRef;
+  if (ref != us->alphaTestRefValue) {
+    us->alphaTestRefValue = ref;
     fxMesa->new_state |= FX_NEW_ALPHA;
   }
 }
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 517199601f4..6724c329fb3 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,4 +1,4 @@
-/* $Id: osmesa.c,v 1.47 2001/02/19 20:01:42 brianp Exp $ */
+/* $Id: osmesa.c,v 1.48 2001/03/03 20:33:29 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -472,7 +472,7 @@ void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value )
    switch (pname) {
       case OSMESA_ROW_LENGTH:
          if (value<0) {
-            gl_error( &ctx->gl_ctx, GL_INVALID_VALUE,
+            _mesa_error( &ctx->gl_ctx, GL_INVALID_VALUE,
                       "OSMesaPixelStore(value)" );
             return;
          }
@@ -483,7 +483,7 @@ void GLAPIENTRY OSMesaPixelStore( GLint pname, GLint value )
          ctx->yup = value ? GL_TRUE : GL_FALSE;
          break;
       default:
-         gl_error( &ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaPixelStore(pname)" );
+         _mesa_error( &ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaPixelStore(pname)" );
          return;
    }
 
@@ -515,7 +515,7 @@ void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value )
          *value = ctx->yup;
          return;
       default:
-         gl_error(&ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");
+         _mesa_error(&ctx->gl_ctx, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");
          return;
    }
 }
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c
index 10ddc0d9950..4ce7343c523 100644
--- a/src/mesa/drivers/svga/svgamesa.c
+++ b/src/mesa/drivers/svga/svgamesa.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa.c,v 1.13 2001/02/06 00:03:47 brianp Exp $ */
+/* $Id: svgamesa.c,v 1.14 2001/03/03 20:33:29 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -473,7 +473,7 @@ void SVGAMesaMakeCurrent( SVGAMesaContext ctx )
       /* setup initial viewport */
       ctx->width = vga_getxdim();
       ctx->height = vga_getydim();
-      gl_Viewport( ctx->gl_ctx, 0, 0, ctx->width, ctx->height );
+      _mesa_set_viewport( ctx->gl_ctx, 0, 0, ctx->width, ctx->height );
    }
 #endif
 }
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 74fea18030e..ff256e266ed 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.13 2001/01/24 00:04:59 brianp Exp $ */
+/* $Id: wmesa.c,v 1.14 2001/03/03 20:33:29 brianp Exp $ */
 
 /*
  * Windows (Win32) device driver for Mesa 3.4
@@ -1355,7 +1355,7 @@ void /*APIENTRY*/ WMesaMakeCurrent( WMesaContext c )
     Current = c;
     if (Current->gl_ctx->Viewport.Width==0) {
         /* initialize viewport to window size */
-        gl_Viewport( Current->gl_ctx,
+        _mesa_set_viewport( Current->gl_ctx,
             0, 0, Current->width, Current->height );
     }
     if ((c->cColorBits <= 8 ) && (c->rgb_flag == GL_TRUE)){
diff --git a/src/mesa/drivers/windows/wmesaBackup.c b/src/mesa/drivers/windows/wmesaBackup.c
index baa57a4ee4f..33a7c40de94 100644
--- a/src/mesa/drivers/windows/wmesaBackup.c
+++ b/src/mesa/drivers/windows/wmesaBackup.c
@@ -1,4 +1,4 @@
-/* $Id: wmesaBackup.c,v 1.2 2000/11/05 18:41:00 keithw Exp $ */
+/* $Id: wmesaBackup.c,v 1.3 2001/03/03 20:33:29 brianp Exp $ */
 
 /*
 *   File name   :   wmesa.c
@@ -22,6 +22,9 @@
 
 /*
  * $Log: wmesaBackup.c,v $
+ * Revision 1.3  2001/03/03 20:33:29  brianp
+ * lots of gl_*() to _mesa_*() namespace clean-up
+ *
  * Revision 1.2  2000/11/05 18:41:00  keithw
  * - Changes for new software rasterizer modules
  * - Remove support for choosing software fallbacks from core code
@@ -1407,7 +1410,7 @@ void WMesaMakeCurrent( WMesaContext c )
     Current = c;
     if (Current->gl_ctx->Viewport.Width==0) {
         /* initialize viewport to window size */
-        gl_Viewport( Current->gl_ctx,
+        _mesa_set_viewport( Current->gl_ctx,
             0, 0, Current->width, Current->height );
     }
     if ((c->cColorBits <= 8 ) && (c->rgb_flag == GL_TRUE)){
diff --git a/src/mesa/drivers/windows/wmesaOld.c b/src/mesa/drivers/windows/wmesaOld.c
index 801d5724e7e..a546676a5f9 100644
--- a/src/mesa/drivers/windows/wmesaOld.c
+++ b/src/mesa/drivers/windows/wmesaOld.c
@@ -20,6 +20,9 @@
 

 /*

  * $Log: wmesaOld.c,v $
+ * Revision 1.3  2001/03/03 20:33:29  brianp
+ * lots of gl_*() to _mesa_*() namespace clean-up
+ *
  * Revision 1.2  2000/11/05 18:41:00  keithw
  * - Changes for new software rasterizer modules
  * - Remove support for choosing software fallbacks from core code
@@ -1338,7 +1341,7 @@ void /*APIENTRY*/ WMesaMakeCurrent( WMesaContext c )
 	setup_DD_pointers(c->gl_ctx);

 	if (Current->gl_ctx->Viewport.Width==0) {

 	  /* initialize viewport to window size */

-	  gl_Viewport( Current->gl_ctx,

+	  _mesa_set_viewport( Current->gl_ctx,

 		           0, 0, Current->width, Current->height );

 	}

 	if ((c->cColorBits <= 8 ) && (c->rgb_flag == GL_TRUE)){

diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c
index b0b6f811ddc..385f30b1b1f 100644
--- a/src/mesa/drivers/windows/wmesa_stereo.c
+++ b/src/mesa/drivers/windows/wmesa_stereo.c
@@ -1273,7 +1273,7 @@ void /*APIENTRY*/ WMesaMakeCurrent( WMesaContext c )
 	setup_DD_pointers(c->gl_ctx);

 	if (Current->gl_ctx->Viewport.Width==0) {

 	  /* initialize viewport to window size */

-	  gl_Viewport( Current->gl_ctx,

+	  _mesa_set_viewport( Current->gl_ctx,

 		           0, 0, Current->width, Current->height );

 	}

 }

diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 6e73504ba5d..3bb27a0c536 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.11 2001/01/08 04:06:20 keithw Exp $ */
+/* $Id: xfonts.c,v 1.12 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -244,7 +244,7 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase )
 
   fs = XQueryFont (dpy, font);
   if (!fs) {
-      gl_error(NULL, GL_INVALID_VALUE,
+      _mesa_error(NULL, GL_INVALID_VALUE,
                "Couldn't get font structure information");
       return;
   }
@@ -259,7 +259,7 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase )
 (GLubyte));
   if (!bm) {
       XFreeFontInfo( NULL, fs, 0 );
-      gl_error(NULL, GL_OUT_OF_MEMORY,
+      _mesa_error(NULL, GL_OUT_OF_MEMORY,
                 "Couldn't allocate bitmap in glXUseXFont()");
       return;
   }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 9ef37b54ddf..8e1bd87517e 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.16 2001/01/23 23:39:37 brianp Exp $ */
+/* $Id: xm_api.c,v 1.17 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -431,7 +431,7 @@ static void free_xmesa_buffer(int client, XMesaBuffer buffer)
       prev = b;
    }
    /* buffer not found in XMesaBufferList */
-   gl_problem(NULL,"free_xmesa_buffer() - buffer not found\n");
+   _mesa_problem(NULL,"free_xmesa_buffer() - buffer not found\n");
 }
 
 
@@ -1410,7 +1410,7 @@ xmesa_color_to_pixel( XMesaContext xmesa, GLubyte r, GLubyte g, GLubyte b, GLuby
             return p;
          }
       default:
-         gl_problem(NULL, "Bad pixel format in xmesa_color_to_pixel");
+         _mesa_problem(NULL, "Bad pixel format in xmesa_color_to_pixel");
    }
    return 0;
 }
@@ -2630,7 +2630,7 @@ unsigned long XMesaDitherColor( XMesaContext xmesa, GLint x, GLint y,
             return p;
          }
       default:
-         gl_problem(NULL, "Bad pixel format in XMesaDitherColor");
+         _mesa_problem(NULL, "Bad pixel format in XMesaDitherColor");
    }
    return 0;
 }
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index a6108e00f7b..a73b3c69735 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -1,4 +1,4 @@
-/* $Id: xm_dd.c,v 1.17 2001/03/01 18:30:47 brianp Exp $ */
+/* $Id: xm_dd.c,v 1.18 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -215,7 +215,7 @@ set_read_buffer( GLcontext *ctx, GLframebuffer *buffer, GLenum mode )
       xmesa_update_span_funcs(ctx);
    }
    else {
-      gl_problem(ctx, "invalid buffer in set_read_buffer() in xmesa2.c");
+      _mesa_problem(ctx, "invalid buffer in set_read_buffer() in xmesa2.c");
    }
 }
 
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c
index a9269bfcbc2..e87fd98a8a5 100644
--- a/src/mesa/drivers/x11/xm_span.c
+++ b/src/mesa/drivers/x11/xm_span.c
@@ -1,4 +1,4 @@
-/* $Id: xm_span.c,v 1.9 2001/02/22 17:50:13 brianp Exp $ */
+/* $Id: xm_span.c,v 1.10 2001/03/03 20:33:30 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -3685,7 +3685,7 @@ static void read_color_span( const GLcontext *ctx,
                }
 	       break;
 	    default:
-	       gl_problem(NULL,"Problem in DD.read_color_span (1)");
+	       _mesa_problem(NULL,"Problem in DD.read_color_span (1)");
                return;
 	 }
       }
@@ -3876,7 +3876,7 @@ static void read_color_span( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_span (2)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_span (2)");
             return;
       }
    }
@@ -4051,7 +4051,7 @@ static void read_color_pixels( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_pixels (1)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
             return;
       }
    }
@@ -4168,7 +4168,7 @@ static void read_color_pixels( const GLcontext *ctx,
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Problem in DD.read_color_pixels (1)");
+	    _mesa_problem(NULL,"Problem in DD.read_color_pixels (1)");
             return;
       }
    }
@@ -4338,7 +4338,7 @@ void xmesa_update_span_funcs( GLcontext *ctx )
             ctx->Driver.WriteMonoRGBAPixels = write_pixels_mono_pixmap;
             break;
 	 default:
-	    gl_problem(NULL,"Bad pixel format in xmesa_update_state (1)");
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (1)");
             return;
       }
    }
@@ -4471,7 +4471,7 @@ void xmesa_update_span_funcs( GLcontext *ctx )
 	    }
 	    break;
 	 default:
-	    gl_problem(NULL,"Bad pixel format in xmesa_update_state (2)");
+	    _mesa_problem(NULL,"Bad pixel format in xmesa_update_state (2)");
             return;
       }
    }