diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-22 00:27:31 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-22 00:27:31 +0000 |
| commit | f959f6e1dc27c71fc0ccc56e09b29101b3bf3b97 (patch) | |
| tree | 15b4171c2b3396e3a05f2776cc24d90cb37c8f84 /src/mesa/main/colortab.c | |
| parent | 05a6f2fd484bab59c6e6a381f58808adc26619f1 (diff) | |
New glTexImage code.
The gl_texture_format struct now has a StoreTexImageFunc that's called
by glTex[Sub]Image[123]D to convert the user's texture data into the
specific texture format layout. Now it's much easier to add new texture
formats (like the 16/32-bit floating point formats).
The texutil.[ch] and texutil_tmp.h files are obsolete.
Diffstat (limited to 'src/mesa/main/colortab.c')
| -rw-r--r-- | src/mesa/main/colortab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index 862f210bb9..59cd6ae0c1 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -414,7 +414,7 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat, assert(table); - if (!_mesa_is_legal_format_and_type(format, type) || + if (!_mesa_is_legal_format_and_type(ctx, format, type) || format == GL_INTENSITY) { _mesa_error(ctx, GL_INVALID_OPERATION, "glColorTable(format or type)"); return; @@ -596,7 +596,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, assert(table); - if (!_mesa_is_legal_format_and_type(format, type) || + if (!_mesa_is_legal_format_and_type(ctx, format, type) || format == GL_INTENSITY) { _mesa_error(ctx, GL_INVALID_OPERATION, "glColorSubTable(format or type)"); return; |