summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-03-27 20:26:10 +0000
committerBrian Paul <[email protected]>2001-03-27 20:26:10 +0000
commit197c526d63e1d4ea96f29eece392cdc389770b38 (patch)
tree4707e60f551c3f9656bdc98f084f653a242bd40f
parent19d1e432612cf7db797da11793b13a6c1c6aac16 (diff)
texFormat was a random value in _mesa_store_teximage3d(), fix by undoing last changes
-rw-r--r--src/mesa/main/texstore.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 0d2807cf953..c1d9dfc4bc8 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1,4 +1,4 @@
-/* $Id: texstore.c,v 1.19 2001/03/27 19:18:02 gareth Exp $ */
+/* $Id: texstore.c,v 1.20 2001/03/27 20:26:10 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -486,14 +486,13 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage)
{
- const struct gl_texture_format *texFormat;
GLint texelBytes;
/* setup the teximage struct's fields */
_mesa_init_tex_format( ctx, internalFormat, texImage );
- texImage->FetchTexel = texFormat->FetchTexel3D;
+ texImage->FetchTexel = texImage->TexFormat->FetchTexel3D;
- texelBytes = texFormat->TexelBytes;
+ texelBytes = texImage->TexFormat->TexelBytes;
/* allocate memory */
texImage->Data = (GLchan *) MALLOC(width * height * depth * texelBytes);