diff options
| author | Oliver McFadden <[email protected]> | 2012-09-11 09:08:15 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:56:37 +0300 |
| commit | 97a8ca47ae8f185f33171a2305dbb1cee70f2880 (patch) | |
| tree | e4ea099411933b10bec7460d4b2cc7366776cc9d | |
| parent | 004f032baf1b30e368d29984f767864e2f80183e (diff) | |
mesa: remove FEATURE_colortable define.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/colortab.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/colortab.h | 26 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
3 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index f20dee67789..5799c01f644 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -39,8 +39,6 @@ #include "main/dispatch.h" -#if FEATURE_colortable - void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, @@ -164,6 +162,3 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp) /* GL_ARB_robustness */ SET_GetnColorTableARB(disp, _mesa_GetnColorTableARB); } - - -#endif /* FEATURE_colortable */ diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index 4e225ffc951..7b8df38a141 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -33,8 +33,6 @@ struct _glapi_table; -#if FEATURE_colortable - extern void GLAPIENTRY _mesa_ColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, @@ -48,29 +46,5 @@ _mesa_ColorSubTable( GLenum target, GLsizei start, extern void _mesa_init_colortable_dispatch(struct _glapi_table *disp); -#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 */ #endif /* COLORTAB_H */ diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index cf652ad3d9c..b5cb288afe6 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 |