diff options
| author | Brian Paul <brianp@vmware.com> | 2010-11-18 16:15:33 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-11-18 16:15:38 -0700 |
| commit | 83e93b6008213ad86607027e8434ecaccc8b1a2c (patch) | |
| tree | 5817bc1a52086eea884e93b1eaf2cb60e90f66f7 /src/mesa/main/mipmap.c | |
| parent | 3dcc3153b087a2ec42e6177d965dd8b2c95779c2 (diff) | |
mesa: pass gl_format to _mesa_init_teximage_fields()
This should prevent the field going unset in the future. See bug
http://bugs.freedesktop.org/show_bug.cgi?id=31544 for background.
Also remove unneeded calls to clear_teximage_fields().
Finally, call _mesa_set_fetch_functions() from the
_mesa_init_teximage_fields() function so callers have one less
thing to worry about.
Diffstat (limited to 'src/mesa/main/mipmap.c')
| -rw-r--r-- | src/mesa/main/mipmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index b1989b4b91..ad63b178df 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1790,9 +1790,9 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target, /* initialize new image */ _mesa_init_teximage_fields(ctx, target, dstImage, dstWidth, dstHeight, - dstDepth, border, srcImage->InternalFormat); + dstDepth, border, srcImage->InternalFormat, + srcImage->TexFormat); dstImage->DriverData = NULL; - dstImage->TexFormat = srcImage->TexFormat; dstImage->FetchTexelc = srcImage->FetchTexelc; dstImage->FetchTexelf = srcImage->FetchTexelf; |