summaryrefslogtreecommitdiff
path: root/src/mesa/main/colortab.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-12-10 19:23:19 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-12-10 19:23:19 +0000
commit90f042ae8dbc00ecedab5cc68dbc6abae4228af5 (patch)
tree3c075fe61d2b793e71ae0d5d2efeeb7b5425c8c2 /src/mesa/main/colortab.c
parent8aa019d2efcf0295beae51989fe4b419ca50ca17 (diff)
generate GL_INVALID_OPERATION error for bad image format/type combinations
Diffstat (limited to 'src/mesa/main/colortab.c')
-rw-r--r--src/mesa/main/colortab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 0de0b0261a..48072c8d7a 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.31 2000/12/09 20:51:12 brianp Exp $ */
+/* $Id: colortab.c,v 1.32 2000/12/10 19:23:19 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -304,7 +304,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
if (!_mesa_is_legal_format_and_type(format, type) ||
format == GL_INTENSITY) {
- gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
+ gl_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)");
return;
}
@@ -521,7 +521,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
if (!_mesa_is_legal_format_and_type(format, type) ||
format == GL_INTENSITY) {
- gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
+ gl_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)");
return;
}