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 744f092d9348001eb6a1c4b9cfce2614066894de..ae46d8d236bed32d97145ab018428f2dee31bb13 100644 (file)
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -27,16 +27,14 @@
 #define COLORTAB_H
 
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-#if FEATURE_colortable
+struct _glapi_table;
+struct gl_color_table;
 
-#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl)                \
-   do {                                                              \
-      (driver)->CopyColorTable       = impl ## CopyColorTable;       \
-      (driver)->CopyColorSubTable    = impl ## CopyColorSubTable;    \
-      (driver)->UpdateTexturePalette = impl ## UpdateTexturePalette; \
-   } while (0)
+#if FEATURE_colortable
 
 extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
@@ -53,10 +51,6 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_colortable */
 
-#include "main/compiler.h"
-
-#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl) do { } while (0)
-
 static INLINE void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
@@ -87,11 +81,4 @@ _mesa_init_colortable( struct gl_color_table *table );
 extern void
 _mesa_free_colortable_data( struct gl_color_table *table );
 
-extern void 
-_mesa_init_colortables( GLcontext *ctx );
-
-extern void 
-_mesa_free_colortables_data( GLcontext *ctx );
-
-
 #endif /* COLORTAB_H */