diff options
| author | Brian Paul <[email protected]> | 2005-10-05 01:48:07 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-10-05 01:48:07 +0000 |
| commit | a9fc8ba756dd25a07dc19058fe60f65bda82a055 (patch) | |
| tree | aa863fa82d93ea468d6c16e3db6fa74ad1ffb5cb /src/mesa/drivers/dri/s3v | |
| parent | 91802fdf730451aaa0246f514f6778ffaef92c50 (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/s3v')
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_texmem.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_texstate.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_texmem.c b/src/mesa/drivers/dri/s3v/s3v_texmem.c index 0ce3ff5fc23..5b44340d19b 100644 --- a/src/mesa/drivers/dri/s3v/s3v_texmem.c +++ b/src/mesa/drivers/dri/s3v/s3v_texmem.c @@ -297,7 +297,7 @@ static void s3vUploadTexLevel( s3vContextPtr vmesa, s3vTextureObjectPtr t, default: fprintf(stderr, "Not supported texture format %s\n", - _mesa_lookup_enum_by_nr(image->Format)); + _mesa_lookup_enum_by_nr(image->_BaseFormat)); } DEBUG_TEX(("words = %i\n\n", words)); diff --git a/src/mesa/drivers/dri/s3v/s3v_texstate.c b/src/mesa/drivers/dri/s3v/s3v_texstate.c index b136c9d378c..2719de3663a 100644 --- a/src/mesa/drivers/dri/s3v/s3v_texstate.c +++ b/src/mesa/drivers/dri/s3v/s3v_texstate.c @@ -73,7 +73,7 @@ static void s3vSetTexImages( s3vContextPtr vmesa, for ( height = i = 0 ; i < numLevels ; i++ ) { t->image[i].image = tObj->Image[0][firstLevel + i]; t->image[i].offset = height * pitch; - t->image[i].internalFormat = baseImage->Format; + t->image[i].internalFormat = baseImage->_BaseFormat; height += t->image[i].image->Height; t->TextureBaseAddr[i] = (t->BufAddr + t->image[i].offset + _TEXALIGN) & (GLuint)(~_TEXALIGN); @@ -96,7 +96,7 @@ static void s3vUpdateTexEnv( GLcontext *ctx, GLuint unit ) s3vContextPtr vmesa = S3V_CONTEXT(ctx); const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; const struct gl_texture_object *tObj = texUnit->_Current; - const GLuint format = tObj->Image[0][tObj->BaseLevel]->Format; + const GLuint format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; /* s3vTextureObjectPtr t = (s3vTextureObjectPtr)tObj->DriverData; GLuint tc; @@ -246,9 +246,9 @@ static void s3vUpdateTexUnit( GLcontext *ctx, GLuint unit ) /* Update texture environment if texture object image format or * texture environment state has changed. */ - if (tObj->Image[0][tObj->BaseLevel]->Format != + if (tObj->Image[0][tObj->BaseLevel]->_BaseFormat != vmesa->TexEnvImageFmt[unit]) { - vmesa->TexEnvImageFmt[unit] = tObj->Image[0][tObj->BaseLevel]->Format; + vmesa->TexEnvImageFmt[unit] = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; s3vUpdateTexEnv( ctx, unit ); } #if 1 |