[Mesa-dev] [PATCH 15/47] mesa: remove FEATURE_pixel_transfer define.
Oliver McFadden
oliver.mcfadden at linux.intel.com
Thu Sep 13 01:18:44 PDT 2012
Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
src/mesa/main/mfeatures.h | 1 -
src/mesa/main/pixel.c | 6 ------
src/mesa/main/pixel.h | 23 -----------------------
3 files changed, 0 insertions(+), 30 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..f926c56 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 797b0d9..bfd76d9 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 );
--
1.7.8.6
More information about the mesa-dev
mailing list