Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/main/mfeatures.h | 1 -
src/mesa/main/rastpos.c | 4 ++--
src/mesa/main/rastpos.h | 6 +++---
src/mesa/state_tracker/st_cb_rasterpos.c | 4 ++--
src/mesa/state_tracker/st_cb_rasterpos.h | 4 ++--
src/mesa/state_tracker/st_draw.c | 4 ++--
src/mesa/state_tracker/st_draw_feedback.c | 4 ++--
src/mesa/state_tracker/st_program.c | 2 +-
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index cb7cce1..8062628 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 a1f6f42..a6e6b9f 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -39,7 +39,7 @@
#include "main/dispatch.h"
-#if FEATURE_rastpos
+#if FEATURE_GL
/**
@@ -533,7 +533,7 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
}
-#endif /* FEATURE_rastpos */
+#endif /* FEATURE_GL */
/**********************************************************************/
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index cdd94a6..f68b278 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -38,19 +38,19 @@
struct _glapi_table;
struct gl_context;
-#if FEATURE_rastpos
+#if FEATURE_GL
extern void
_mesa_init_rastpos_dispatch(struct _glapi_table *disp);
-#else /* FEATURE_rastpos */
+#else /* FEATURE_GL */
static inline void
_mesa_init_rastpos_dispatch(struct _glapi_table *disp)
{
}
-#endif /* FEATURE_rastpos */
+#endif /* FEATURE_GL */
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 8337f46..018e8b9 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -50,7 +50,7 @@
#include "vbo/vbo.h"
-#if FEATURE_rastpos
+#if FEATURE_GL
/**
* Our special drawing pipeline stage (replaces rasterization).
@@ -276,4 +276,4 @@ void st_init_rasterpos_functions(struct dd_function_table
*functions)
functions->RasterPos = st_RasterPos;
}
-#endif /* FEATURE_rastpos */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.h
b/src/mesa/state_tracker/st_cb_rasterpos.h
index b61411b..bcbd3d0 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.h
+++ b/src/mesa/state_tracker/st_cb_rasterpos.h
@@ -34,7 +34,7 @@
struct dd_function_table;
-#if FEATURE_rastpos
+#if FEATURE_GL
extern void st_init_rasterpos_functions(struct dd_function_table *functions);
@@ -45,6 +45,6 @@ st_init_rasterpos_functions(struct dd_function_table
*functions)
{
}
-#endif /* FEATURE_rastpos */
+#endif /* FEATURE_GL */
#endif /* ST_CB_RASTERPOS_H */
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 5c79aff..a886b31 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -278,7 +278,7 @@ st_init_draw(struct st_context *st)
vbo_set_draw_func(ctx, st_draw_vbo);
-#if FEATURE_GL || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_GL
st->draw = draw_create(st->pipe); /* for selection/feedback */
/* Disable draw options that might convert points/lines to tris, etc.
@@ -295,7 +295,7 @@ st_init_draw(struct st_context *st)
void
st_destroy_draw(struct st_context *st)
{
-#if FEATURE_GL || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_GL
draw_destroy(st->draw);
#endif
}
diff --git a/src/mesa/state_tracker/st_draw_feedback.c
b/src/mesa/state_tracker/st_draw_feedback.c
index dc80772..74c1e84 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -46,7 +46,7 @@
#include "draw/draw_context.h"
-#if FEATURE_GL || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_GL
/**
* Set the (private) draw module's post-transformed vertex format when in
@@ -269,5 +269,5 @@ st_feedback_draw_vbo(struct gl_context *ctx,
draw_set_vertex_buffers(draw, 0, NULL);
}
-#endif /* FEATURE_GL || FEATURE_rastpos */
+#endif /* FEATURE_GL || FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_program.c
b/src/mesa/state_tracker/st_program.c
index fcec863..adc795b 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -66,7 +66,7 @@ delete_vp_variant(struct st_context *st, struct st_vp_variant
*vpv)
if (vpv->driver_shader)
cso_delete_vertex_shader(st->cso_context, vpv->driver_shader);
-#if FEATURE_GL || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_GL
if (vpv->draw_shader)
draw_delete_vertex_shader( st->draw, vpv->draw_shader );
#endif
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
