diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-04-20 16:46:04 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-04-20 16:46:04 +0000 |
| commit | 1c85aa33321821b44bea83d3dee702ab4e05f406 (patch) | |
| tree | 567f84afc974e718489a64860e7625eb18dcf0f2 /src/mesa/drivers/glide/fxddtex.c | |
| parent | 3518a7950f3d1d57edb0a5d346c28bccade6fb61 (diff) | |
Fixed a texture conversion problem: sometimes need to produce an intermediate
texture image in the base internal format between user->Mesa format
conversion. See comments in texstore.c
Diffstat (limited to 'src/mesa/drivers/glide/fxddtex.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 4e64f40e86..6232144a3b 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1234,6 +1234,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, * simple (format = simpleFormat, type = CHAN_TYPE). */ _mesa_transfer_teximage(ctx, 2, /* dimensions */ + simpleFormat, /* base int format */ simpleFormat, /* dest format */ tempImage, /* dest addr */ width, height, 1, /* src size */ @@ -1339,7 +1340,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level, * a simpler format now. */ - GLenum simpleFormat = _mesa_base_tex_format(ctx, texImage->TexFormat->IntFormat); + GLenum simpleFormat = texImage->TexFormat->BaseFormat; GLint comps = _mesa_components_in_format(simpleFormat); GLubyte *tempImage; GLboolean success; @@ -1350,6 +1351,7 @@ fxDDTexSubImage2D(GLcontext * ctx, GLenum target, GLint level, * simple (format = simpleFormat, type = CHAN_TYPE). */ _mesa_transfer_teximage(ctx, 2, /* dimensions */ + simpleFormat, /* base int format */ simpleFormat, /* dest format */ tempImage, /* dest addr */ width, height, 1, /* src size */ |