summaryrefslogtreecommitdiff
path: root/src/mesa/main/colortab.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-06-27 15:47:59 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-06-27 15:47:59 +0000
commit2a1f50aee4f30dbd0c55d8f0b7185b690c841051 (patch)
tree014d8b767978ada694d3569ef1fea666c4508999 /src/mesa/main/colortab.c
parent498c09040ecd5208326eac2e16ae0473effc4445 (diff)
fixed GL_INTENSITY error checking bug
Diffstat (limited to 'src/mesa/main/colortab.c')
-rw-r--r--src/mesa/main/colortab.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 143d9e99d4..9ee3f0f2bb 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.18 2000/05/24 14:03:04 brianp Exp $ */
+/* $Id: colortab.c,v 1.19 2000/06/27 15:47:59 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -301,7 +301,8 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
assert(table);
- if (!_mesa_is_legal_format_and_type(format, type)) {
+ if (!_mesa_is_legal_format_and_type(format, type) ||
+ format == GL_INTENSITY) {
gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
return;
}
@@ -477,7 +478,8 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
assert(table);
- if (!_mesa_is_legal_format_and_type(format, type)) {
+ if (!_mesa_is_legal_format_and_type(format, type) ||
+ format == GL_INTENSITY) {
gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
return;
}