mesa: return INVALID_VALUE from VertexAttribDivisor if index out of range

[mesa.git] / src / mesa / main / colortab.h

diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index e3bc76e5c3375eaf3ddf6a7d55271947410c46eb..f25fbe8a5dcf53039d41be9b1494c049ccefb08a 100644 (file)
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,59 +27,41 @@
 #define COLORTAB_H
 
 
-#include "mtypes.h"
-
-
-extern void
-_mesa_init_colortable( struct gl_color_table *p );
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-extern void
-_mesa_free_colortable_data( struct gl_color_table *p );
+struct _glapi_table;
 
-
-extern void
+void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *table );
-
-
-extern void
+void GLAPIENTRY
 _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,
                      const GLvoid *table );
-
-
-extern void
-_mesa_CopyColorSubTable(GLenum target, GLsizei start,
-                        GLint x, GLint y, GLsizei width);
-
-
-extern void
+void GLAPIENTRY
 _mesa_CopyColorTable(GLenum target, GLenum internalformat,
                      GLint x, GLint y, GLsizei width);
-
-
-extern void
+void GLAPIENTRY
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width);
+void GLAPIENTRY
+_mesa_GetnColorTableARB( GLenum target, GLenum format, GLenum type,
+                         GLsizei bufSize, GLvoid *data );
+void GLAPIENTRY
 _mesa_GetColorTable( GLenum target, GLenum format,
-                     GLenum type, GLvoid *table );
-
-
-extern void
+                     GLenum type, GLvoid *data );
+void GLAPIENTRY
 _mesa_ColorTableParameterfv(GLenum target, GLenum pname,
                             const GLfloat *params);
-
-
-extern void
-_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
-                            const GLint *params);
-
-
-extern void
+void GLAPIENTRY
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
+void GLAPIENTRY
 _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
-
-
-extern void
+void GLAPIENTRY
 _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
 
 
-#endif
+#endif /* COLORTAB_H */