[Mesa-dev] [PATCH 08/45] mesa: replace FEATURE_colortable with FEATURE_GL define.

[Oliver McFadden]

Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
 src/mesa/main/colortab.c  |    4 ++--
 src/mesa/main/colortab.h  |    6 +++---
 src/mesa/main/mfeatures.h |    1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index f20dee6..5f06815 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -39,7 +39,7 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_colortable
+#if FEATURE_GL
 
 void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalFormat,
@@ -166,4 +166,4 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_colortable */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 4e225ff..a4c3f62 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -33,7 +33,7 @@
 
 struct _glapi_table;
 
-#if FEATURE_colortable
+#if FEATURE_GL
 
 extern void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
@@ -48,7 +48,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
 extern void
 _mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_colortable */
+#else /* FEATURE_GL */
 
 static inline void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
@@ -71,6 +71,6 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp)
 {
 }
 
-#endif /* FEATURE_colortable */
+#endif /* FEATURE_GL */
 
 #endif /* COLORTAB_H */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index cf652ad..b5cb288 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_colortable                FEATURE_GL
 #define FEATURE_convolve                  FEATURE_GL
 #define FEATURE_dlist                     FEATURE_GL
 #define FEATURE_draw_read_buffer          FEATURE_GL
-- 
1.7.8.6