uint*t -> u_int*t changes

[mesa.git] / src / mesa / drivers / dri / tdfx / tdfx_tex.c

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 2e8e3cba5dd5297f8991508e941d27caeddb0860..3091fd186355798fe64e63ba02fc75da63f80eb8 100644 (file)
--- 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",