diff options
| author | Eric Anholt <[email protected]> | 2011-01-04 15:25:35 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-01-04 15:25:35 -0800 |
| commit | 3488b14a047bf1f05831b3bbdc374a0da482212c (patch) | |
| tree | 61469a32a351cbc1e74d7b32ee88263ced990872 | |
| parent | 5dbb856e960f9448ec4e322f936f5f6763ee77e2 (diff) | |
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.
| -rw-r--r-- | 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 c5ae63052a7..7e8ec036419 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 */ |