Mesa (mesa_7_6_branch): mesa: fix GL_TEXTURE_INTERNAL_FORMAT query for compressed formats
Brian Paul
brianp at kemper.freedesktop.org
Fri Oct 23 20:46:45 UTC 2009
Module: Mesa
Branch: mesa_7_6_branch
Commit: cd62b4f00a11e9c548bd61652f88ab772d8421b8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd62b4f00a11e9c548bd61652f88ab772d8421b8
Author: Brian Paul <brianp at vmware.com>
Date: Fri Oct 23 14:40:40 2009 -0600
mesa: fix GL_TEXTURE_INTERNAL_FORMAT query for compressed formats
Need to return the actual compressed format when the user originally
requested a generic compressed format.
---
src/mesa/main/texparam.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index b2fbe22..9d1fdd0 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -776,7 +776,15 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
*params = img->Depth;
break;
case GL_TEXTURE_INTERNAL_FORMAT:
- *params = img->InternalFormat;
+ if (img->IsCompressed) {
+ /* need to return the actual compressed format */
+ *params = _mesa_compressed_format_to_glenum(ctx,
+ img->TexFormat->MesaFormat);
+ }
+ else {
+ /* return the user's requested internal format */
+ *params = img->InternalFormat;
+ }
break;
case GL_TEXTURE_BORDER:
*params = img->Border;
More information about the mesa-commit
mailing list