mesa: remove FEATURE_pixel_transfer define.

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

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index d604c69ec778ec09f76781d55e5a7730df2cccf9..73f707482e8f17a98210829eb9f1f79876883b93 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_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 450c936b7453bcfacf761b5d6024c16bc0910f8b..f926c56a44072fa0af863a883143f9bf3768c62e 100644 (file)
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -40,9 +40,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_pixel_transfer
-
-
 /**********************************************************************/
 /*****                    glPixelZoom                             *****/
 /**********************************************************************/
@@ -670,9 +667,6 @@ _mesa_init_pixel_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_pixel_transfer */
-
-
 /**********************************************************************/
 /*****                      Initialization                        *****/
 /**********************************************************************/

diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 797b0d9d6249330e48cd11501b56eda8dd852a72..bfd76d934676ce475fa49a072d47c8ba842565d1 100644 (file)
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -41,8 +41,6 @@ struct _glapi_table;
 struct gl_context;
 
 
-#if FEATURE_pixel_transfer
-
 extern void GLAPIENTRY
 _mesa_PixelTransferf(GLenum pname, GLfloat param);
 
@@ -52,27 +50,6 @@ _mesa_update_pixel( struct gl_context *ctx, GLuint newstate );
 extern void
 _mesa_init_pixel_dispatch( struct _glapi_table * disp );
 
-#else /* FEATURE_pixel_transfer */
-
-static inline void GLAPIENTRY
-_mesa_PixelTransferf(GLenum pname, GLfloat param)
-{
-}
-
-
-static inline void
-_mesa_update_pixel(struct gl_context *ctx, GLuint newstate)
-{
-}
-
-static inline void
-_mesa_init_pixel_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_pixel_transfer */
-
-
 extern void 
 _mesa_init_pixel( struct gl_context * ctx );