diff options
author | marha <marha@users.sourceforge.net> | 2009-12-22 17:33:44 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-12-22 17:33:44 +0000 |
commit | b729d9e1cc1c60e415da24143cabcbaccb525ed7 (patch) | |
tree | 54fc81d1a046dc5ec6f4aa2a2d8a2ad015c423fd /mesalib/src/mesa/main/texparam.c | |
parent | 0695dfb71ca6fe132d15a4d0890e8a868183adf9 (diff) | |
download | vcxsrv-b729d9e1cc1c60e415da24143cabcbaccb525ed7.tar.gz vcxsrv-b729d9e1cc1c60e415da24143cabcbaccb525ed7.tar.bz2 vcxsrv-b729d9e1cc1c60e415da24143cabcbaccb525ed7.zip |
Updated to mesa_7_6_1_rc1
Diffstat (limited to 'mesalib/src/mesa/main/texparam.c')
-rw-r--r-- | mesalib/src/mesa/main/texparam.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index b2fbe2205..9d1fdd056 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/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; |