From e71654961868eac559210ced359c1af114138d8a Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 18 Oct 2002 13:24:08 +0000
Subject: only allow intformat==GL_COLOR_INDEX if EXT_paletted_texture is
 supported

---
 src/mesa/main/teximage.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main/teximage.c')

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 792fe352c35..e33a3986756 100644
--- 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:
-- 
cgit v1.2.3