Merge remote branch 'origin/nvc0'

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

diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 406d3e7ff87938c7409599f0c927595e539134da..ae46d8d236bed32d97145ab018428f2dee31bb13 100644 (file)
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -1,21 +1,19 @@
-/* $Id: colortab.h,v 1.3 1999/11/11 17:50:04 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  6.5.2
+ *
+ * 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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -29,28 +27,58 @@
 #define COLORTAB_H
 
 
-#include "types.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
+struct _glapi_table;
+struct gl_color_table;
 
-extern void
-_mesa_ColorTableEXT( GLenum target, GLenum internalformat,
-                     GLsizei width, GLenum format, GLenum type,
+#if FEATURE_colortable
+
+extern void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
                      const GLvoid *table );
 
 extern void
-_mesa_ColorSubTableEXT( GLenum target, GLsizei start,
-                        GLsizei count, GLenum format, GLenum type,
-                        const GLvoid *table );
+_mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
-extern void
-_mesa_GetColorTableEXT( GLenum target, GLenum format,
-                        GLenum type, GLvoid *table );
+#else /* FEATURE_colortable */
+
+static INLINE void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table )
+{
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *table )
+{
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_init_colortable_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_colortable */
 
-extern void
-_mesa_GetColorTableParameterfvEXT( GLenum target, GLenum pname, GLfloat *params );
 
 extern void
-_mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params );
+_mesa_init_colortable( struct gl_color_table *table );
 
+extern void
+_mesa_free_colortable_data( struct gl_color_table *table );
 
-#endif
+#endif /* COLORTAB_H */