Mesa (master): mesa: Remove GL_COLOR_INDEX from base format assertions

Ian Romanick idr at kemper.freedesktop.org
Tue Sep 6 19:10:33 UTC 2011


Module: Mesa
Branch: master
Commit: 559241d48c01ad36e1ea18e6c44aa5bc587d3002
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=559241d48c01ad36e1ea18e6c44aa5bc587d3002

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Aug 29 13:34:52 2011 -0700

mesa: Remove GL_COLOR_INDEX from base format assertions

_mesa_make_temp_float_image can't work on color-index textures, but
there is no such thing as a color-index texture anymore.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/main/texstore.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index e9915a7..2cdc8ed 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -340,7 +340,6 @@ _mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,
           logicalBaseFormat == GL_LUMINANCE ||
           logicalBaseFormat == GL_ALPHA ||
           logicalBaseFormat == GL_INTENSITY ||
-          logicalBaseFormat == GL_COLOR_INDEX ||
           logicalBaseFormat == GL_DEPTH_COMPONENT);
 
    ASSERT(textureBaseFormat == GL_RGBA ||
@@ -351,7 +350,6 @@ _mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims,
           textureBaseFormat == GL_LUMINANCE ||
           textureBaseFormat == GL_ALPHA ||
           textureBaseFormat == GL_INTENSITY ||
-          textureBaseFormat == GL_COLOR_INDEX ||
           textureBaseFormat == GL_DEPTH_COMPONENT);
 
    tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth




More information about the mesa-commit mailing list