diff options
| author | Eric Anholt <[email protected]> | 2011-04-20 09:33:59 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-04-23 13:14:56 -0700 |
| commit | 7d1a2056a84b5af75adf84e34a57e5d75f550139 (patch) | |
| tree | 092df5598997926e43b817c0debdd65494f17b2d /src/mesa/main/mipmap.c | |
| parent | bc880b8d405e72be29c80e7e7e505f59755a388a (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa/main/mipmap.c')
| -rw-r--r-- | 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 e594160ad9e..75bc9a09b4f 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, |