uint*t -> u_int*t changes

3 files changed, 6 insertions, 2 deletions

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_state.c b/src/mesa/drivers/dri/tdfx/tdfx_state.c
index 6edf804b2ec..7aa6098c721 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_state.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_state.c
@@ -71,7 +71,7 @@ static void tdfxUpdateAlphaMode( GLcontext *ctx )
 {
    tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
    GrCmpFnc_t func;
-   GrAlphaBlendFnc_t srcRGB, dstRGB, srcA, dstA;
+   GrAlphaBlendFnc_t srcRGB, dstRGB = GR_BLEND_ZERO, srcA, dstA;
    GrAlphaBlendOp_t eqRGB, eqA;
    GrAlpha_t ref = (GLint) (ctx->Color.AlphaRef * 255.0);
    
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 2e8e3cba5dd..3091fd18635 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -69,7 +69,7 @@ _mesa_halve2x2_teximage2d ( GLcontext *ctx,
    GLuint bpt = 0;
    GLubyte *_s = NULL;
    GLubyte *_d = NULL;
-   GLenum _t;
+   GLenum _t = 0;
 
    if (texImage->TexFormat->MesaFormat == MESA_FORMAT_RGB565) {
       _t = GL_UNSIGNED_SHORT_5_6_5_REV;
@@ -650,6 +650,8 @@ convertPalette(FxU32 data[256], const struct gl_color_table *table)
             data[i] = (a << 24) | (r << 16) | (g << 8) | b;
         }
         return GR_TEXTABLE_PALETTE_6666_EXT;
+    default:
+	return GR_TEXTABLE_NCC0;	/* ???? */
     }
     /* XXX fixme: how can this happen? */
     _mesa_error(NULL, GL_INVALID_ENUM, "convertPalette: table->Format == %s",
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
index bb974279a2a..7059b56e3d0 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_texstate.c
@@ -1922,8 +1922,10 @@ static void setupTextureDoubleTMU(GLcontext * ctx)
    tdfxTexInfo *ti1 = TDFX_TEXTURE_DATA(tObj1);
    struct gl_texture_image *baseImage0 = tObj0->Image[0][tObj0->BaseLevel];
    struct gl_texture_image *baseImage1 = tObj1->Image[0][tObj1->BaseLevel];
+#if 0/*JJJ*/
    const GLenum envMode0 = ctx->Texture.Unit[0].EnvMode;
    const GLenum envMode1 = ctx->Texture.Unit[1].EnvMode;
+#endif
 
    if (baseImage0->Border > 0 || baseImage1->Border > 0) {
       FALLBACK(fxMesa, TDFX_FALLBACK_TEXTURE_BORDER, GL_TRUE);