summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <oliver.mcfadden@linux.intel.com>2012-09-11 09:21:38 +0300
committerOliver McFadden <oliver.mcfadden@linux.intel.com>2012-09-15 12:57:00 +0300
commitd4c2b1e8f8775c982955192c0ef23f82b9e6c8b2 (patch)
tree7c6e7bdf3ef52e587bd52f801affb84dbe5f7508
parent25ee9617ff0b537bb30de92983baa745e49556b6 (diff)
mesa: remove FEATURE_rastpos define.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/mesa/main/mfeatures.h1
-rw-r--r--src/mesa/main/rastpos.c6
-rw-r--r--src/mesa/main/rastpos.h11
-rw-r--r--src/mesa/state_tracker/st_cb_rasterpos.c4
-rw-r--r--src/mesa/state_tracker/st_cb_rasterpos.h10
5 files changed, 0 insertions, 32 deletions
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index cb7cce1d25c..8062628d3ac 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_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 a1f6f423416..ab8e2c1a3c3 100644
--- 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 cdd94a66ce0..9bb04cc9c48 100644
--- 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 8337f462418..fb4a62ee33a 100644
--- 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 b61411bd20c..bfd3e41380d 100644
--- 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 */