mesa: Fix core GL genned-name handling for glBeginQuery().

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

diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 744f092d9348001eb6a1c4b9cfce2614066894de..7b8df38a1417317354e9ec0f78ecd286bffa8489 100644 (file)
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -27,16 +27,11 @@
 #define COLORTAB_H
 
 
-#include "main/mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+#include "mfeatures.h"
 
-#if FEATURE_colortable
-
-#define _MESA_INIT_COLORTABLE_FUNCTIONS(driver, impl)                \
-   do {                                                              \
-      (driver)->CopyColorTable       = impl ## CopyColorTable;       \
-      (driver)->CopyColorSubTable    = impl ## CopyColorSubTable;    \
-      (driver)->UpdateTexturePalette = impl ## UpdateTexturePalette; \
-   } while (0)
+struct _glapi_table;
 
 extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
@@ -51,47 +46,5 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
 extern void
 _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,
-                  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_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 */