diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-30 15:31:44 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-30 15:31:44 +0000 |
| commit | e116d3b3e55a70ceb4af270ecd1b614117f631a2 (patch) | |
| tree | 71a4194bc65cebb13876fdc1f2a2a19f72e4dde0 /src/mesa/main/teximage.c | |
| parent | 7b0b2ec73ac27d571fbaddeb4b23b8cabde7f963 (diff) | |
texImage->FetchTexel wasn't getting initialized in _mesa_CopyTexImage1/2D()
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index d14f5779fb..6f13cc5daf 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.89 2001/03/28 21:36:31 gareth Exp $ */ +/* $Id: teximage.c,v 1.90 2001/03/30 15:31:44 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1348,6 +1348,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat, ASSERT(texImage->TexFormat); texImage->FetchTexel = texImage->TexFormat->FetchTexel1D; + ASSERT(texImage->FetchTexel); /* state update */ texObj->Complete = GL_FALSE; @@ -1457,6 +1458,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat, ASSERT(texImage->TexFormat); texImage->FetchTexel = texImage->TexFormat->FetchTexel2D; + ASSERT(texImage->FetchTexel); /* state update */ texObj->Complete = GL_FALSE; @@ -1560,6 +1562,7 @@ _mesa_TexImage3D( GLenum target, GLint level, GLenum internalFormat, ASSERT(texImage->TexFormat); texImage->FetchTexel = texImage->TexFormat->FetchTexel3D; + ASSERT(texImage->FetchTexel); /* state update */ texObj->Complete = GL_FALSE; @@ -1784,6 +1787,10 @@ _mesa_CopyTexImage1D( GLenum target, GLint level, (*ctx->Driver.CopyTexImage1D)(ctx, target, level, internalFormat, x, y, width, border); + ASSERT(texImage->TexFormat); + texImage->FetchTexel = texImage->TexFormat->FetchTexel1D; + ASSERT(texImage->FetchTexel); + /* state update */ texObj->Complete = GL_FALSE; ctx->NewState |= _NEW_TEXTURE; @@ -1840,6 +1847,10 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat, (*ctx->Driver.CopyTexImage2D)(ctx, target, level, internalFormat, x, y, width, height, border); + ASSERT(texImage->TexFormat); + texImage->FetchTexel = texImage->TexFormat->FetchTexel2D; + ASSERT(texImage->FetchTexel); + /* state update */ texObj->Complete = GL_FALSE; ctx->NewState |= _NEW_TEXTURE; |