[Mesa-dev] [PATCH 15/45] mesa: replace FEATURE_pixel_transfer with FEATURE_GL define.

[Oliver McFadden]

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

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index d604c69..73f7074 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_pixel_transfer            FEATURE_GL
 #define FEATURE_queryobj                  FEATURE_GL
 #define FEATURE_rastpos                   FEATURE_GL
 #define FEATURE_texture_fxt1              FEATURE_GL
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 450c936..bb6fd34 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -40,7 +40,7 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_pixel_transfer
+#if FEATURE_GL
 
 
 /**********************************************************************/
@@ -670,7 +670,7 @@ _mesa_init_pixel_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_pixel_transfer */
+#endif /* FEATURE_GL */
 
 
 /**********************************************************************/
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 797b0d9..f77a716 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -41,7 +41,7 @@ struct _glapi_table;
 struct gl_context;
 
 
-#if FEATURE_pixel_transfer
+#if FEATURE_GL
 
 extern void GLAPIENTRY
 _mesa_PixelTransferf(GLenum pname, GLfloat param);
@@ -52,7 +52,7 @@ _mesa_update_pixel( struct gl_context *ctx, GLuint newstate );
 extern void
 _mesa_init_pixel_dispatch( struct _glapi_table * disp );
 
-#else /* FEATURE_pixel_transfer */
+#else /* FEATURE_GL */
 
 static inline void GLAPIENTRY
 _mesa_PixelTransferf(GLenum pname, GLfloat param)
@@ -70,7 +70,7 @@ _mesa_init_pixel_dispatch(struct _glapi_table *disp)
 {
 }
 
-#endif /* FEATURE_pixel_transfer */
+#endif /* FEATURE_GL */
 
 
 extern void 
-- 
1.7.8.6