Mesa (master): mesa: Fix the baseFormat for GL_COMPRESSED_SLUMINANCE_EXT.
Eric Anholt
anholt at kemper.freedesktop.org
Tue Jan 4 23:32:19 UTC 2011
Module: Mesa
Branch: master
Commit: 3488b14a047bf1f05831b3bbdc374a0da482212c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3488b14a047bf1f05831b3bbdc374a0da482212c
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 4 15:25:35 2011 -0800
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.
---
src/mesa/main/teximage.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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 */
More information about the mesa-commit
mailing list