From: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Date: Tue, 11 Sep 2012 06:17:44 +0000 (+0300)
Subject: mesa: remove FEATURE_pixel_transfer define.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ba82f910874e07180d08ae37ebd043eee727f84;p=mesa.git

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 d604c69ec77..73f707482e8 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 450c936b745..f926c56a440 100644
--- 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 797b0d9d624..bfd76d93467 100644
--- 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 );