From a9fc8ba756dd25a07dc19058fe60f65bda82a055 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 5 Oct 2005 01:48:07 +0000 Subject: In gl_texture_image replace IntFormat with InternalFormat and Format with _BaseFormat to be consistant with gl_renderbuffer. --- src/mesa/drivers/dri/i830/i830_texstate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/drivers/dri/i830') diff --git a/src/mesa/drivers/dri/i830/i830_texstate.c b/src/mesa/drivers/dri/i830/i830_texstate.c index 358c554f3b..a11ae7660a 100644 --- a/src/mesa/drivers/dri/i830/i830_texstate.c +++ b/src/mesa/drivers/dri/i830/i830_texstate.c @@ -185,7 +185,7 @@ static void i830SetTexImages( i830ContextPtr imesa, } else total_height += t->image[0][i].image->Height; - t->image[0][i].internalFormat = baseImage->Format; + t->image[0][i].internalFormat = baseImage->_BaseFormat; } t->Pitch = pitch; @@ -586,9 +586,9 @@ static GLboolean enable_tex_common( GLcontext *ctx, GLuint unit ) * missed (need to update last stage flag?). Call * i830UpdateTexEnv always. */ - if (tObj->Image[0][tObj->BaseLevel]->Format != + if (tObj->Image[0][tObj->BaseLevel]->_BaseFormat != imesa->TexEnvImageFmt[unit]) { - imesa->TexEnvImageFmt[unit] = tObj->Image[0][tObj->BaseLevel]->Format; + imesa->TexEnvImageFmt[unit] = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; } i830UpdateTexEnv( ctx, unit ); imesa->TexEnabledMask |= I830_TEX_UNIT_ENABLED(unit); -- cgit v1.2.3