summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2014-07-10 23:58:56 -0700
committerJason Ekstrand <[email protected]>2014-08-05 10:56:15 -0700
commit55a929955fa683a4e59ffb730ae37b645d10ba49 (patch)
tree6284788b3a9445e75da246aba5f263d9c04058b4
parent12610ffcf79b20996f16fec4cbed1c1e2ef67f5e (diff)
mesa/formats: Remove IndexBits
Mesa hasn't supported color-indexed textures for some time. This is 0 for all texture formats, so we don't need to store it. Signed-off-by: Jason Ekstrand <[email protected]> Reviewed-by: Brian Paul <[email protected]>
-rw-r--r--src/mesa/main/format_info.py2
-rw-r--r--src/mesa/main/formats.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/format_info.py b/src/mesa/main/format_info.py
index 9b63bfb5592..b8956a5ba1c 100644
--- a/src/mesa/main/format_info.py
+++ b/src/mesa/main/format_info.py
@@ -171,7 +171,7 @@ for fmat in formats:
bits = [ get_channel_bits(fmat, name) for name in ['r', 'g', 'b', 'a']]
print ' {0},'.format(', '.join(map(str, bits)))
- bits = [ get_channel_bits(fmat, name) for name in ['l', 'i', 'I', 'z', 's']]
+ bits = [ get_channel_bits(fmat, name) for name in ['l', 'i', 'z', 's']]
print ' {0},'.format(', '.join(map(str, bits)))
print ' {0}, {1}, {2},'.format(fmat.block_width, fmat.block_height,
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index e2370641283..39cc5f177c9 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -59,7 +59,6 @@ struct gl_format_info
GLubyte AlphaBits;
GLubyte LuminanceBits;
GLubyte IntensityBits;
- GLubyte IndexBits;
GLubyte DepthBits;
GLubyte StencilBits;
@@ -145,7 +144,7 @@ _mesa_get_format_bits(mesa_format format, GLenum pname)
case GL_TEXTURE_LUMINANCE_SIZE:
return info->LuminanceBits;
case GL_INDEX_BITS:
- return info->IndexBits;
+ return 0;
case GL_DEPTH_BITS:
case GL_TEXTURE_DEPTH_SIZE_ARB:
case GL_RENDERBUFFER_DEPTH_SIZE_EXT: