From 559241d48c01ad36e1ea18e6c44aa5bc587d3002 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 29 Aug 2011 13:34:52 -0700 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke --- src/mesa/main/texstore.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index e9915a7f070..2cdc8ed6740 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 -- 2.11.0