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/r300 | |
| 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/r300')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 5c51e30637b..9d929516c96 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -253,7 +253,7 @@ static void r300SetTexImages(r300ContextPtr rmesa, if(0) fprintf(stderr, "w=%d h=%d d=%d tb=%d intFormat=%d\n", texImage->Width, texImage->Height, texImage->Depth, texImage->TexFormat->TexelBytes, - texImage->IntFormat); + texImage->InternalFormat); /* Align to 32-byte offset. It is faster to do this unconditionally * (no branch penalty). @@ -1325,7 +1325,7 @@ static GLboolean update_tex_common(GLcontext * ctx, int unit) } #endif - format = tObj->Image[0][tObj->BaseLevel]->Format; + format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat; if (rmesa->state.texture.unit[unit].format != format || rmesa->state.texture.unit[unit].envMode != texUnit->EnvMode) { //rmesa->state.texture.unit[unit].format = format; |