mesa: remove FEATURE_convolve define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 74f28da87ee94a7e1abe984330db7433cf66ebe0..cac8a997976cf0ea8b54d3b78ff2aee856a538e4 100644 (file)
--- 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 952285643b5d5e82bb431a0194999f2c0fa69135..2fbe3c7f509fef86bfdd1047713c9d8c07438813 100644 (file)
--- 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 b5cb288afe633204b7ff2bc31780a2ecb5813475..6094a02e980b8035e8bb7a17278a478b06ea1354 100644 (file)
--- 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