summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2012-09-11 09:08:56 +0300
committerOliver McFadden <[email protected]>2012-09-15 12:56:40 +0300
commitdce86022514268bd2be1e6f99657e5aa2897e20d (patch)
tree6522c3e126b4e13e5ef5f8b530fba6cba41c42df /src/mesa/main
parent97a8ca47ae8f185f33171a2305dbb1cee70f2880 (diff)
mesa: remove FEATURE_convolve define.
Signed-off-by: Oliver McFadden <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/convolve.c5
-rw-r--r--src/mesa/main/convolve.h12
-rw-r--r--src/mesa/main/mfeatures.h1
3 files changed, 0 insertions, 18 deletions
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 74f28da87ee..cac8a997976 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 952285643b5..2fbe3c7f509 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 b5cb288afe6..6094a02e980 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