From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Oct 2009 20:40:40 +0000 (-0600)
Subject: mesa: fix GL_TEXTURE_INTERNAL_FORMAT query for compressed formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cd62b4f00a11e9c548bd61652f88ab772d8421b8;p=mesa.git

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.
---

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index b2fbe2205ba..9d1fdd05664 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;