5 files changed, 14 insertions, 14 deletions

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 667f0fd022..40b1d5d79c 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 3378b8162c..dc7137a933 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 1ded0f4cca..4c4fb01825 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 a5a81dd597..2e2a71c88e 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 5b768848ce..5d844473d8 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;
   }
 }