summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-23 14:40:40 -0600
committerBrian Paul <brianp@vmware.com>2009-10-23 14:45:44 -0600
commitcd62b4f00a11e9c548bd61652f88ab772d8421b8 (patch)
treea1fa9a2a5f1cd68a80cfca448e7938267ae27ae5 /src/mesa
parent9528dc6ed8d09eba0dc3be17dc5e9ef4add8083c (diff)
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.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texparam.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index b2fbe2205b..9d1fdd0566 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;