From dce86022514268bd2be1e6f99657e5aa2897e20d Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Tue, 11 Sep 2012 09:08:56 +0300 Subject: mesa: remove FEATURE_convolve define. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul --- src/mesa/main/convolve.c | 5 ----- src/mesa/main/convolve.h | 12 ------------ src/mesa/main/mfeatures.h | 1 - 3 files changed, 18 deletions(-) diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index 74f28da..cac8a99 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -41,8 +41,6 @@ #include "main/dispatch.h" -#if FEATURE_convolve - static void GLAPIENTRY _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image) { @@ -200,6 +198,3 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp) SET_GetnConvolutionFilterARB(disp, _mesa_GetnConvolutionFilterARB); SET_GetnSeparableFilterARB(disp, _mesa_GetnSeparableFilterARB); } - - -#endif /* FEATURE_convolve */ diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h index 9522856..2fbe3c7 100644 --- a/src/mesa/main/convolve.h +++ b/src/mesa/main/convolve.h @@ -33,19 +33,7 @@ struct _glapi_table; - -#if FEATURE_convolve - extern void _mesa_init_convolve_dispatch(struct _glapi_table *disp); -#else /* FEATURE_convolve */ - -static inline void -_mesa_init_convolve_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_convolve */ - #endif /* CONVOLVE_H */ diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index b5cb288..6094a02 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_convolve FEATURE_GL #define FEATURE_dlist FEATURE_GL #define FEATURE_draw_read_buffer FEATURE_GL #define FEATURE_drawpix FEATURE_GL -- cgit v1.1