From 1c85aa33321821b44bea83d3dee702ab4e05f406 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 20 Apr 2001 16:46:04 +0000 Subject: 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 --- src/mesa/drivers/glide/fxddtex.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/glide/fxddtex.c') 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 */ -- cgit v1.2.3