mesa: remove FEATURE_rastpos 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 cb7cce1d25cc6e2d8adfa1bf01fb68eb9d20166c..8062628d3ac6a5a7825d03eb07d7d434334dea23 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_rastpos                   FEATURE_GL
 #define FEATURE_texture_fxt1              FEATURE_GL
 #define FEATURE_texture_s3tc              FEATURE_GL
 

diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index a1f6f4234160fb9894139826be20e7f05470390d..ab8e2c1a3c38b26c32a6091981e97bbbb21d5d75 100644 (file)
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -39,9 +39,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_rastpos
-
-
 /**
  * Helper function for all the RasterPos functions.
  */
@@ -533,9 +530,6 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_rastpos */
-
-
 /**********************************************************************/
 /** \name Initialization                                              */
 /**********************************************************************/

diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index cdd94a66ce063f6071ea89e9d3d8bd65e89a58f2..9bb04cc9c4808b1fd3b67f50952b9a9e009f7fdc 100644 (file)
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -38,20 +38,9 @@
 struct _glapi_table;
 struct gl_context;
 
-#if FEATURE_rastpos
-
 extern void
 _mesa_init_rastpos_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_rastpos */
-
-static inline void
-_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_rastpos */
-
 extern void 
 _mesa_init_rastpos(struct gl_context *ctx);
 

diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 8337f4624186fd0abe1a503dc56c2988f263efcf..fb4a62ee33aa398405ff0db0838e249be65bdd56 100644 (file)
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -50,8 +50,6 @@
 #include "vbo/vbo.h"
 
 
-#if FEATURE_rastpos
-
 /**
  * Our special drawing pipeline stage (replaces rasterization).
  */
@@ -275,5 +273,3 @@ void st_init_rasterpos_functions(struct dd_function_table *functions)
 {
    functions->RasterPos = st_RasterPos;
 }
-
-#endif /* FEATURE_rastpos */

diff --git a/src/mesa/state_tracker/st_cb_rasterpos.h b/src/mesa/state_tracker/st_cb_rasterpos.h
index b61411bd20c46bcbc5c79d8df4ee2b39e18e7d24..bfd3e41380d46a143bbbeb0ba8c151953ad753ce 100644 (file)
--- a/src/mesa/state_tracker/st_cb_rasterpos.h
+++ b/src/mesa/state_tracker/st_cb_rasterpos.h
@@ -34,17 +34,7 @@
 
 struct dd_function_table;
 
-#if FEATURE_rastpos
-
 extern void st_init_rasterpos_functions(struct dd_function_table *functions);
 
-#else
-
-static INLINE void
-st_init_rasterpos_functions(struct dd_function_table *functions)
-{
-}
-
-#endif /* FEATURE_rastpos */
 
 #endif /* ST_CB_RASTERPOS_H */