only allow intformat==GL_COLOR_INDEX if EXT_paletted_texture is supported

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 792fe352c35be48b7518e88b6e0fa32199acdcb7..e33a398675600da572bfb060af94f70de54b204d 100644 (file)
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.120 2002/10/17 22:26:06 kschultz Exp $ */
+/* $Id: teximage.c,v 1.121 2002/10/18 13:24:08 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -212,7 +212,10 @@ _mesa_base_tex_format( GLcontext *ctx, GLint format )
       case GL_COLOR_INDEX8_EXT:
       case GL_COLOR_INDEX12_EXT:
       case GL_COLOR_INDEX16_EXT:
-         return GL_COLOR_INDEX;
+         if (ctx->Extensions.EXT_paletted_texture)
+            return GL_COLOR_INDEX;
+         else
+            return -1;
       case GL_DEPTH_COMPONENT:
       case GL_DEPTH_COMPONENT16_SGIX:
       case GL_DEPTH_COMPONENT24_SGIX: