compilation updates

This commit is contained in:
Brian Paul 2001-03-28 21:39:49 +00:00
parent f1f288182e
commit 3d9168025c
2 changed files with 2 additions and 3 deletions

View file

@ -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;

View file

@ -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) {