summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/mach64
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-10-05 01:48:07 +0000
committerBrian Paul <[email protected]>2005-10-05 01:48:07 +0000
commita9fc8ba756dd25a07dc19058fe60f65bda82a055 (patch)
treeaa863fa82d93ea468d6c16e3db6fa74ad1ffb5cb /src/mesa/drivers/dri/mach64
parent91802fdf730451aaa0246f514f6778ffaef92c50 (diff)
In gl_texture_image replace IntFormat with InternalFormat and Format with
_BaseFormat to be consistant with gl_renderbuffer.
Diffstat (limited to 'src/mesa/drivers/dri/mach64')
-rw-r--r--src/mesa/drivers/dri/mach64/mach64_texstate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_texstate.c b/src/mesa/drivers/dri/mach64/mach64_texstate.c
index ada4b056f57..b6a9e3f931e 100644
--- a/src/mesa/drivers/dri/mach64/mach64_texstate.c
+++ b/src/mesa/drivers/dri/mach64/mach64_texstate.c
@@ -163,9 +163,9 @@ static void mach64SetTexImages( mach64ContextPtr mmesa,
t->setup.tex_cntl &= ~R128_MIP_MAP_DISABLE;
#else
- if ( ( baseImage->Format == GL_RGBA ) ||
- ( baseImage->Format == GL_ALPHA ) ||
- ( baseImage->Format == GL_LUMINANCE_ALPHA ) ) {
+ if ( ( baseImage->_BaseFormat == GL_RGBA ) ||
+ ( baseImage->_BaseFormat == GL_ALPHA ) ||
+ ( baseImage->_BaseFormat == GL_LUMINANCE_ALPHA ) ) {
t->hasAlpha = 1;
} else {
t->hasAlpha = 0;
@@ -188,7 +188,7 @@ static void mach64UpdateTextureEnv( GLcontext *ctx, int unit )
GLint source = mmesa->tmu_source[unit];
const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[source];
const struct gl_texture_object *tObj = texUnit->_Current;
- const GLenum format = tObj->Image[0][tObj->BaseLevel]->Format;
+ const GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
GLuint s = mmesa->setup.scale_3d_cntl;
if ( MACH64_DEBUG & DEBUG_VERBOSE_API ) {