projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/glsl: remove unused uses_builtin_functions field
[mesa.git]
/
src
/
mesa
/
main
/
colortab.c
diff --git
a/src/mesa/main/colortab.c
b/src/mesa/main/colortab.c
index 18f993adfbdfaaeecf028a46746177b23c90fb1d..a8edb03dd0efebcb3dcbea672cef2411b924a9f3 100644
(file)
--- a/
src/mesa/main/colortab.c
+++ b/
src/mesa/main/colortab.c
@@
-1,6
+1,5
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version: 7.1
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
*
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
*
@@
-45,7
+44,7
@@
_mesa_ColorTable( GLenum target, GLenum internalFormat,
const GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
const GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glColorTable(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glColorTable
");
}
}
@@
-56,7
+55,7
@@
_mesa_ColorSubTable( GLenum target, GLsizei start,
const GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
const GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glColorSubTable(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glColorSubTable
");
}
}
@@
-66,7
+65,7
@@
_mesa_CopyColorTable(GLenum target, GLenum internalformat,
GLint x, GLint y, GLsizei width)
{
GET_CURRENT_CONTEXT(ctx);
GLint x, GLint y, GLsizei width)
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glCopyColorTable(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glCopyColorTable
");
}
}
@@
-76,7
+75,7
@@
_mesa_CopyColorSubTable(GLenum target, GLsizei start,
GLint x, GLint y, GLsizei width)
{
GET_CURRENT_CONTEXT(ctx);
GLint x, GLint y, GLsizei width)
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glCopyColorSubTable(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glCopyColorSubTable
");
}
}
@@
-86,7
+85,7
@@
_mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type,
GLsizei bufSize, GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
GLsizei bufSize, GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glGetnColorTableARB(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glGetnColorTableARB
");
}
}
@@
-95,7
+94,7
@@
_mesa_GetColorTable( GLenum target, GLenum format,
GLenum type, GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
GLenum type, GLvoid *data )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glGetColorTable(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glGetColorTable
");
}
}
@@
-104,7
+103,7
@@
_mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
{
/* no extensions use this function */
GET_CURRENT_CONTEXT(ctx);
{
/* no extensions use this function */
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glColorTableParameterfv(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glColorTableParameterfv
");
}
}
@@
-114,7
+113,7
@@
_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
{
/* no extensions use this function */
GET_CURRENT_CONTEXT(ctx);
{
/* no extensions use this function */
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glColorTableParameteriv(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glColorTableParameteriv
");
}
}
@@
-123,7
+122,7
@@
void GLAPIENTRY
_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glGetColorTableParameterfv(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glGetColorTableParameterfv
");
}
}
@@
-132,5
+131,5
@@
void GLAPIENTRY
_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
{
GET_CURRENT_CONTEXT(ctx);
- _mesa_error(ctx, GL_INVALID_
ENUM, "glGetColorTableParameteriv(target)
");
+ _mesa_error(ctx, GL_INVALID_
OPERATION, "glGetColorTableParameteriv
");
}
}