diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-05 01:48:07 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-05 01:48:07 +0000 |
| commit | a9fc8ba756dd25a07dc19058fe60f65bda82a055 (patch) | |
| tree | aa863fa82d93ea468d6c16e3db6fa74ad1ffb5cb /src/mesa/swrast/s_texcombine.c | |
| 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/swrast/s_texcombine.c')
| -rw-r--r-- | src/mesa/swrast/s_texcombine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 0f662c3d2b..3c9fdc4d75 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -743,7 +743,7 @@ texture_apply( const GLcontext *ctx, baseLevel = texUnit->_Current->BaseLevel; ASSERT(texUnit->_Current->Image[0][baseLevel]); - format = texUnit->_Current->Image[0][baseLevel]->Format; + format = texUnit->_Current->Image[0][baseLevel]->_BaseFormat; if (format == GL_COLOR_INDEX || format == GL_YCBCR_MESA) { format = GL_RGBA; /* a bit of a hack */ |