summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-04-24 16:11:35 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-04-24 16:11:35 +0000
commit8753bd89002c31f4cc747cceafbb12368424b8f3 (patch)
tree982b6b9c4366f8ce88e8179b5aea3b95f386f832
parent691f58930b84f5baa566052a270dc2df05806a81 (diff)
fixed problems with texel component size queries in glGetTexLevelParameter()
-rw-r--r--src/mesa/main/texstate.c50
1 files changed, 42 insertions, 8 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index fe80a70d30..bc9ed8b77f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.46 2001/04/20 19:21:41 brianp Exp $ */
+/* $Id: texstate.c,v 1.47 2001/04/24 16:11:35 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1124,6 +1124,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
const struct gl_texture_image *img = NULL;
GLuint dimensions;
GLboolean isProxy;
+ GLenum baseIntFormat;
ASSERT_OUTSIDE_BEGIN_END(ctx);
if (level < 0 || level >= ctx->Const.MaxTextureLevels) {
@@ -1147,6 +1148,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
return;
}
+ baseIntFormat = _mesa_base_tex_format(ctx, img->IntFormat);
+
isProxy = (target == GL_PROXY_TEXTURE_1D) ||
(target == GL_PROXY_TEXTURE_2D) ||
(target == GL_PROXY_TEXTURE_3D) ||
@@ -1169,25 +1172,56 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
*params = img->Border;
return;
case GL_TEXTURE_RED_SIZE:
- *params = img->TexFormat->RedBits;
+ if (baseIntFormat == GL_RGB ||
+ baseIntFormat == GL_RGBA)
+ *params = img->TexFormat->RedBits;
+ else
+ *params = 0;
return;
case GL_TEXTURE_GREEN_SIZE:
- *params = img->TexFormat->GreenBits;
+ if (baseIntFormat == GL_RGB ||
+ baseIntFormat == GL_RGBA)
+ *params = img->TexFormat->GreenBits;
+ else
+ *params = 0;
return;
case GL_TEXTURE_BLUE_SIZE:
- *params = img->TexFormat->BlueBits;
+ if (baseIntFormat == GL_RGB ||
+ baseIntFormat == GL_RGBA)
+ *params = img->TexFormat->BlueBits;
+ else
+ *params = 0;
return;
case GL_TEXTURE_ALPHA_SIZE:
- *params = img->TexFormat->AlphaBits;
+ if (baseIntFormat == GL_ALPHA ||
+ baseIntFormat == GL_LUMINANCE_ALPHA ||
+ baseIntFormat == GL_RGBA)
+ *params = img->TexFormat->AlphaBits;
+ else
+ *params = 0;
return;
case GL_TEXTURE_INTENSITY_SIZE:
- *params = img->TexFormat->IntensityBits;
+ if (baseIntFormat != GL_INTENSITY)
+ *params = 0;
+ else if (img->TexFormat->IntensityBits > 0)
+ *params = img->TexFormat->IntensityBits;
+ else /* intensity probably stored as rgb texture */
+ *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
return;
case GL_TEXTURE_LUMINANCE_SIZE:
- *params = img->TexFormat->LuminanceBits;
+ if (baseIntFormat != GL_LUMINANCE &&
+ baseIntFormat != GL_LUMINANCE_ALPHA)
+ *params = 0;
+ else if (img->TexFormat->LuminanceBits > 0)
+ *params = img->TexFormat->LuminanceBits;
+ else /* luminance probably stored as rgb texture */
+ *params = MIN2(img->TexFormat->RedBits, img->TexFormat->GreenBits);
return;
case GL_TEXTURE_INDEX_SIZE_EXT:
- *params = img->TexFormat->IndexBits;
+ if (baseIntFormat == GL_COLOR_INDEX)
+ *params = img->TexFormat->IndexBits;
+ else
+ *params = 0;
return;
case GL_DEPTH_BITS:
/* XXX this isn't in the GL_SGIX_depth_texture spec