[Mesa-dev] [PATCH 09/45] mesa: replace FEATURE_convolve with FEATURE_GL define.

Oliver McFadden oliver.mcfadden at linux.intel.com
Tue Sep 11 02:56:22 PDT 2012


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

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 74f28da..df7d5de 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -41,7 +41,7 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_convolve
+#if FEATURE_GL
 
 static void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
@@ -202,4 +202,4 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_convolve */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 9522856..1299f60 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -34,18 +34,18 @@
 struct _glapi_table;
 
 
-#if FEATURE_convolve
+#if FEATURE_GL
 
 extern void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_convolve */
+#else /* FEATURE_GL */
 
 static inline void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 {
 }
 
-#endif /* FEATURE_convolve */
+#endif /* FEATURE_GL */
 
 #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
-- 
1.7.8.6



More information about the mesa-dev mailing list