Mesa (master): mesa: Don' t assert on the compressed convertformat for GenerateMipmaps.
Eric Anholt
anholt at kemper.freedesktop.org
Sat Apr 23 20:23:05 UTC 2011
Module: Mesa
Branch: master
Commit: 7d1a2056a84b5af75adf84e34a57e5d75f550139
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d1a2056a84b5af75adf84e34a57e5d75f550139
Author: Eric Anholt <eric at anholt.net>
Date: Wed Apr 20 09:33:59 2011 -0700
mesa: Don't assert on the compressed convertformat for GenerateMipmaps.
This assertion doesn't make any sense to me -- the convertFormat is
already something valid (tested above), and the BaseFormat dictated by
convertFormat doesn't matter to the function about to be called (it's
the datatype/comps that were pulled out of convertFormat).
Fixes assertion failure in
GL_EXT_texture_compression_rgtc/fbo-generatemipmap-formats
(still has a rendering failure in NPOT like S3TC does).
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/main/mipmap.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index e594160..75bc9a0 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1896,7 +1896,6 @@ _mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
const GLenum srcFormat = _mesa_get_format_base_format(convertFormat);
GLint dstRowStride
= _mesa_format_row_stride(dstImage->TexFormat, dstWidth);
- ASSERT(srcFormat == GL_RGB || srcFormat == GL_RGBA);
_mesa_texstore(ctx, 2, dstImage->_BaseFormat,
dstImage->TexFormat,
More information about the mesa-commit
mailing list