From: Eric Anholt Date: Tue, 4 Jan 2011 23:25:35 +0000 (-0800) Subject: mesa: Fix the baseFormat for GL_COMPRESSED_SLUMINANCE_EXT. X-Git-Tag: mesa-7.11-rc1~2967 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3488b14a047bf1f05831b3bbdc374a0da482212c;p=platform%2Fupstream%2Fmesa.git mesa: Fix the baseFormat for GL_COMPRESSED_SLUMINANCE_EXT. It's just LUMINANCE, not LUMINANCE_ALPHA. Fixes fbo-generatemipmap-formats GL_EXT_texture_sRGB-s3tc assertion failure when it tries to pack the L8 channels into LUMINANCE_ALPHA and wonders why it's trying to do that. --- diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index c5ae630..7e8ec03 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -340,11 +340,11 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat ) return GL_RGBA; case GL_SLUMINANCE_ALPHA_EXT: case GL_SLUMINANCE8_ALPHA8_EXT: - case GL_COMPRESSED_SLUMINANCE_EXT: case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT: return GL_LUMINANCE_ALPHA; case GL_SLUMINANCE_EXT: case GL_SLUMINANCE8_EXT: + case GL_COMPRESSED_SLUMINANCE_EXT: return GL_LUMINANCE; default: ; /* fallthrough */