compilation updates

diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index f15fcf8..4e64f40 100644 (file)
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1193,7 +1193,6 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
    }
 
    texImage->TexFormat = mesaTexFormat;
-   texImage->Type = 0;         /* indicates a driver-specific format */
 
    /* allocate storage for texture image */
    texImage->Data = MALLOC(mml->width * mml->height * texelSize);
@@ -1340,7 +1339,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level,
        * a simpler format now.
        */
 
-      GLenum simpleFormat = _mesa_base_tex_format(ctx, texImage->IntFormat);
+      GLenum simpleFormat = _mesa_base_tex_format(ctx, texImage->TexFormat->IntFormat);
       GLint comps = _mesa_components_in_format(simpleFormat);
       GLubyte *tempImage;
       GLboolean success;

diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index ae98976..9c12f3f 100644 (file)
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -108,7 +108,7 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
    else
       FX_smallLodLog2(ti->info) = FX_largeLodLog2(ti->info);
 
-   fxTexGetFormat(tObj->Image[minl]->IntFormat, &(ti->info.format),
+   fxTexGetFormat(tObj->Image[minl]->TexFormat->IntFormat, &(ti->info.format),
                  &(ti->baseLevelInternalFormat));
 
    switch (tObj->WrapS) {