mesa: Remove all mention of GL_COLOR_INDEX*_EXT

These enums were only valid with the paletted texture extensions.
This allows a couple other trivial clean-ups.

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

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 37127dcb7a24da89044669284330077d76c9cd37..3e75e7c6bd958e1b9f4d4f44faaa7d85d30f2815 100644 (file)
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -249,12 +249,6 @@ _mesa_components_in_format( GLenum format )
 {
    switch (format) {
       case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
       case GL_STENCIL_INDEX:
       case GL_DEPTH_COMPONENT:
       case GL_RED:
@@ -862,27 +856,6 @@ _mesa_is_color_format(GLenum format)
 }
 
 
-/**
- * Test if the given image format is a color index format.
- */
-GLboolean
-_mesa_is_index_format(GLenum format)
-{
-   switch (format) {
-      case GL_COLOR_INDEX:
-      case GL_COLOR_INDEX1_EXT:
-      case GL_COLOR_INDEX2_EXT:
-      case GL_COLOR_INDEX4_EXT:
-      case GL_COLOR_INDEX8_EXT:
-      case GL_COLOR_INDEX12_EXT:
-      case GL_COLOR_INDEX16_EXT:
-         return GL_TRUE;
-      default:
-         return GL_FALSE;
-   }
-}
-
-
 /**
  * Test if the given image format is a depth component format.
  */

diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 005fbccbeb073e4c98a6ba25744df51566ea0346..46adaec4149c82d45b09755cbb519d1a93f944e9 100644 (file)
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -60,9 +60,6 @@ _mesa_is_legal_format_and_type(const struct gl_context *ctx,
 extern GLboolean
 _mesa_is_color_format(GLenum format);
 
-extern GLboolean
-_mesa_is_index_format(GLenum format);
-
 extern GLboolean
 _mesa_is_depth_format(GLenum format);
 

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index a64e1a01292440dafc04f89e8253889f54d02273..99ace91a9724452e3fb74689ff23da554dc222c9 100644 (file)
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -515,16 +515,12 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
    }
 
    if (_mesa_components_in_format(format) <= 0 ||
-       format == GL_STENCIL_INDEX) {
+       format == GL_STENCIL_INDEX ||
+       format == GL_COLOR_INDEX) {
       _mesa_error( ctx, GL_INVALID_ENUM, "glGetTexImage(format)" );
       return GL_TRUE;
    }
 
-   if (_mesa_is_index_format(format)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
-      return GL_TRUE;
-   }
-
    if (!ctx->Extensions.ARB_depth_texture && _mesa_is_depth_format(format)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format)");
       return GL_TRUE;