diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-28 21:39:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-28 21:39:49 +0000 |
| commit | 3d9168025c97b25d7a26f30a3d5e61284861f2ae (patch) | |
| tree | 97bc5ada5575600c557f03d5103289753119f5c4 /src/mesa/drivers | |
| parent | f1f288182ec07eddeefa591fce20fe69ce3744e2 (diff) | |
compilation updates
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/glide/fxsetup.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index f15fcf88b6..4e64f40e86 100644 --- 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 ae98976b1b..9c12f3fb87 100644 --- 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) { |