Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
---
src/mesa/drivers/common/meta.c | 6 +++---
src/mesa/main/feedback.c | 4 ++--
src/mesa/main/feedback.h | 6 +++---
src/mesa/main/mfeatures.h | 1 -
src/mesa/state_tracker/st_cb_feedback.c | 4 ++--
src/mesa/state_tracker/st_cb_feedback.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 +-
9 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 7e81e5e..f8e2634 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -178,7 +178,7 @@ struct save_state
struct gl_query_object *CondRenderQuery;
GLenum CondRenderMode;
-#if FEATURE_feedback
+#if FEATURE_GL
/** MESA_META_SELECT_FEEDBACK */
GLenum RenderMode;
struct gl_selection Select;
@@ -770,7 +770,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_EndConditionalRender();
}
-#if FEATURE_feedback
+#if FEATURE_GL
if (state & MESA_META_SELECT_FEEDBACK) {
save->RenderMode = ctx->RenderMode;
if (ctx->RenderMode == GL_SELECT) {
@@ -1076,7 +1076,7 @@ _mesa_meta_end(struct gl_context *ctx)
save->CondRenderMode);
}
-#if FEATURE_feedback
+#if FEATURE_GL
if (state & MESA_META_SELECT_FEEDBACK) {
if (save->RenderMode == GL_SELECT) {
_mesa_RenderMode(GL_SELECT);
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index f95e3b5..fb6c73e 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -40,7 +40,7 @@
#include "main/dispatch.h"
-#if FEATURE_feedback
+#if FEATURE_GL
#define FB_3D 0x01
@@ -515,7 +515,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
}
-#endif /* FEATURE_feedback */
+#endif /* FEATURE_GL */
/**********************************************************************/
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c64db31..f801b63 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -31,7 +31,7 @@
#include "main/mtypes.h"
-#if FEATURE_feedback
+#if FEATURE_GL
extern GLint GLAPIENTRY
_mesa_RenderMode( GLenum mode );
@@ -60,7 +60,7 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
extern void
_mesa_init_feedback_dispatch(struct _glapi_table *disp);
-#else /* FEATURE_feedback */
+#else /* FEATURE_GL */
#include "main/compiler.h"
@@ -94,7 +94,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
{
}
-#endif /* FEATURE_feedback */
+#endif /* FEATURE_GL */
extern void
_mesa_init_feedback( struct gl_context *ctx );
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index c1abe81..d604c69 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_feedback FEATURE_GL
#define FEATURE_pixel_transfer FEATURE_GL
#define FEATURE_queryobj FEATURE_GL
#define FEATURE_rastpos FEATURE_GL
diff --git a/src/mesa/state_tracker/st_cb_feedback.c
b/src/mesa/state_tracker/st_cb_feedback.c
index 9b85a39..6bca10b 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -55,7 +55,7 @@
#include "draw/draw_pipe.h"
-#if FEATURE_feedback
+#if FEATURE_GL
/**
* This is actually used for both feedback and selection.
@@ -306,4 +306,4 @@ void st_init_feedback_functions(struct dd_function_table
*functions)
functions->RenderMode = st_RenderMode;
}
-#endif /* FEATURE_feedback */
+#endif /* FEATURE_GL */
diff --git a/src/mesa/state_tracker/st_cb_feedback.h
b/src/mesa/state_tracker/st_cb_feedback.h
index 02e34e4..b78527b 100644
--- a/src/mesa/state_tracker/st_cb_feedback.h
+++ b/src/mesa/state_tracker/st_cb_feedback.h
@@ -35,7 +35,7 @@
struct dd_function_table;
-#if FEATURE_feedback
+#if FEATURE_GL
extern void
st_init_feedback_functions(struct dd_function_table *functions);
@@ -47,6 +47,6 @@ st_init_feedback_functions(struct dd_function_table
*functions)
{
}
-#endif /* FEATURE_feedback */
+#endif /* FEATURE_GL */
#endif /* ST_CB_FEEDBACK_H */
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 9dc4822..5c79aff 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_feedback || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_rastpos
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_feedback || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_rastpos
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 820918e..dc80772 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_feedback || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_rastpos
/**
* 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_feedback || FEATURE_rastpos */
+#endif /* FEATURE_GL || FEATURE_rastpos */
diff --git a/src/mesa/state_tracker/st_program.c
b/src/mesa/state_tracker/st_program.c
index 9f45ed4..fcec863 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_feedback || FEATURE_rastpos
+#if FEATURE_GL || FEATURE_rastpos
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
