X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fcolortab.h;h=4e225ffc951e60f033e3691b96712c023922705d;hb=5a193557d115e62bf70c599e4037d8e1e3f5a9fc;hp=9e976e0a26b1eb249573cc9afd4ad36c8c9a640e;hpb=4bdcfe50f8886e43714f9b7edd25cbff19e6a97d;p=mesa.git

diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 9e976e0a26b..4e225ffc951 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -1,21 +1,19 @@
-/* $Id: colortab.h,v 1.7 2000/04/17 17:57:04 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999-2000  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,59 +27,50 @@
 #define COLORTAB_H
 
 
-#include "types.h"
-
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-extern void
-_mesa_init_colortable( struct gl_color_table *p );
+struct _glapi_table;
 
-extern void
-_mesa_free_colortable_data( struct gl_color_table *p );
+#if FEATURE_colortable
 
-
-extern void
+extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *table );
 
-
-extern void
+extern 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);
+_mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
+#else /* FEATURE_colortable */
 
-extern void
-_mesa_CopyColorTable(GLenum target, GLenum internalformat,
-                     GLint x, GLint y, GLsizei width);
-
-
-extern void
-_mesa_GetColorTable( GLenum target, GLenum format,
-                     GLenum type, GLvoid *table );
-
-
-extern void
-_mesa_ColorTableParameterfv(GLenum target, GLenum pname,
-                            const GLfloat *params);
-
-
-extern void
-_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
-                            const GLint *params);
-
-
-extern void
-_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
+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();
+}
 
-extern void
-_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
+static inline void
+_mesa_init_colortable_dispatch(struct _glapi_table *disp)
+{
+}
 
+#endif /* FEATURE_colortable */
 
-#endif
+#endif /* COLORTAB_H */