minor clean-ups and warning fixes

3 files changed, 6 insertions, 22 deletions

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 0acb2a95975..772e304d09b 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.49 2001/04/17 21:25:53 brianp Exp $ */
+/* $Id: attrib.c,v 1.50 2001/05/03 14:11:18 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -672,7 +672,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
          bordColor[2] = CHAN_TO_FLOAT(obj->BorderColor[2]);
          bordColor[3] = CHAN_TO_FLOAT(obj->BorderColor[3]);
 
-         _mesa_TexParameteri(target, GL_TEXTURE_PRIORITY, obj->Priority);
+         _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
          _mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, bordColor);
          _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
          _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);
@@ -694,7 +694,7 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
                                 obj->CompareOperator);
          }
          if (ctx->Extensions.SGIX_shadow_ambient) {
-            _mesa_TexParameteri(target, GL_SHADOW_AMBIENT_SGIX,
+            _mesa_TexParameterf(target, GL_SHADOW_AMBIENT_SGIX,
                                 CHAN_TO_FLOAT(obj->ShadowAmbient));
          }
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 948de1b330f..d09ca7f8539 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.135 2001/04/28 08:39:17 keithw Exp $ */
+/* $Id: context.c,v 1.136 2001/05/03 14:11:18 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1498,7 +1498,7 @@ _mesa_initialize_context( GLcontext *ctx,
 
 
 #if defined(MESA_TRACE)
-   ctx->TraceCtx = CALLOC( sizeof(trace_context_t) );
+   ctx->TraceCtx = (trace_context_t *) CALLOC( sizeof(trace_context_t) );
 #if 0
    /* Brian: do you want to have CreateContext fail here,
        or should we just trap in NewTrace (currently done)? */
@@ -1675,18 +1675,6 @@ _mesa_destroy_context( GLcontext *ctx )
 
 
 /*
- * Called by the driver after both the context and driver are fully
- * initialized.  Currently just reads the config file.
- */
-void
-_mesa_context_initialize( GLcontext *ctx )
-{
-   _mesa_read_config_file( ctx );
-}
-
-
-
-/*
  * Copy attribute groups from one context to another.
  * Input:  src - source context
  *         dst - destination context
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 825881b8704..3d56ada0533 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -1,4 +1,4 @@
-/* $Id: context.h,v 1.26 2001/04/27 21:17:20 brianp Exp $ */
+/* $Id: context.h,v 1.27 2001/05/03 14:11:18 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -150,10 +150,6 @@ _mesa_destroy_context( GLcontext *ctx );
 
 
 extern void
-_mesa_context_initialize( GLcontext *ctx );
-
-
-extern void
 _mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);