mesa: remove FEATURE_feedback define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index ff701ba871b9e4412f3db4b003efb2f8c37c6768..0d569b63ea54d4d091335ae4b3ccaeab7c3adbf7 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -179,12 +179,10 @@ struct save_state
    struct gl_query_object *CondRenderQuery;
    GLenum CondRenderMode;
 
-#if FEATURE_feedback
    /** MESA_META_SELECT_FEEDBACK */
    GLenum RenderMode;
    struct gl_selection Select;
    struct gl_feedback Feedback;
-#endif
 
    /** MESA_META_MULTISAMPLE */
    GLboolean MultisampleEnabled;
@@ -751,7 +749,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
         _mesa_EndConditionalRender();
    }
 
-#if FEATURE_feedback
    if (state & MESA_META_SELECT_FEEDBACK) {
       save->RenderMode = ctx->RenderMode;
       if (ctx->RenderMode == GL_SELECT) {
@@ -762,7 +759,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
         _mesa_RenderMode(GL_RENDER);
       }
    }
-#endif
 
    if (state & MESA_META_MULTISAMPLE) {
       save->MultisampleEnabled = ctx->Multisample.Enabled;
@@ -1057,7 +1053,6 @@ _mesa_meta_end(struct gl_context *ctx)
                                      save->CondRenderMode);
    }
 
-#if FEATURE_feedback
    if (state & MESA_META_SELECT_FEEDBACK) {
       if (save->RenderMode == GL_SELECT) {
         _mesa_RenderMode(GL_SELECT);
@@ -1067,7 +1062,6 @@ _mesa_meta_end(struct gl_context *ctx)
         ctx->Feedback = save->Feedback;
       }
    }
-#endif
 
    if (state & MESA_META_MULTISAMPLE) {
       if (ctx->Multisample.Enabled != save->MultisampleEnabled)

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index f95e3b5d4595158254dc0ed49ce4137949775c8d..8a63acdf1c632b98159e6a24b06bae38aa9e9d66 100644 (file)
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -40,9 +40,6 @@
 #include "main/dispatch.h"
 
 
-#if FEATURE_feedback
-
-
 #define FB_3D          0x01
 #define FB_4D          0x02
 #define FB_COLOR       0x04
@@ -515,9 +512,6 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 }
 
 
-#endif /* FEATURE_feedback */
-
-
 /**********************************************************************/
 /** \name Initialization */
 /*@{*/

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c64db31344a2780f502c4fcfe45aa3bc4ecda282..cc4cf15a8330bed71a08968f7a809279a91b8f85 100644 (file)
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -31,8 +31,6 @@
 #include "main/mtypes.h"
 
 
-#if FEATURE_feedback
-
 extern GLint GLAPIENTRY
 _mesa_RenderMode( GLenum mode );
 
@@ -60,41 +58,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 extern void
 _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_feedback */
-
-#include "main/compiler.h"
-
-static inline void
-_mesa_feedback_vertex( struct gl_context *ctx,
-                       const GLfloat win[4],
-                       const GLfloat color[4],
-                       const GLfloat texcoord[4] )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-
-static inline void
-_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static inline void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_feedback */
 
 extern void
 _mesa_init_feedback( struct gl_context *ctx );

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index c1abe8110a7d5c117788dd9faf0a61d516866f67..d604c69ec778ec09f76781d55e5a7730df2cccf9 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_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 9b85a39beddf62ca0e94d9caf020f48620ce05d4..9092e3a71274a820c724be2ce78eb1f5b9b2d653 100644 (file)
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -55,8 +55,6 @@
 #include "draw/draw_pipe.h"
 
 
-#if FEATURE_feedback
-
 /**
  * This is actually used for both feedback and selection.
  */
@@ -305,5 +303,3 @@ void st_init_feedback_functions(struct dd_function_table *functions)
 {
    functions->RenderMode = st_RenderMode;
 }
-
-#endif /* FEATURE_feedback */

diff --git a/src/mesa/state_tracker/st_cb_feedback.h b/src/mesa/state_tracker/st_cb_feedback.h
index 02e34e4027135609fae40f8daf8b8c2056b7c3ec..0163631e32f9c2eccc32cedcd9afe4235233c452 100644 (file)
--- a/src/mesa/state_tracker/st_cb_feedback.h
+++ b/src/mesa/state_tracker/st_cb_feedback.h
@@ -35,18 +35,8 @@
 
 struct dd_function_table;
 
-#if FEATURE_feedback
-
 extern void
 st_init_feedback_functions(struct dd_function_table *functions);
 
-#else
-
-static INLINE void
-st_init_feedback_functions(struct dd_function_table *functions)
-{
-}
-
-#endif /* FEATURE_feedback */
 
 #endif /* ST_CB_FEEDBACK_H */

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 9dc4822cc28e6b1407dbb1e6eebf20ee5db84a84..4800e1c879f3ac29f69e71205670e4e1a9ab55a7 100644 (file)
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -278,7 +278,6 @@ st_init_draw(struct st_context *st)
 
    vbo_set_draw_func(ctx, st_draw_vbo);
 
-#if FEATURE_feedback || FEATURE_rastpos
    st->draw = draw_create(st->pipe); /* for selection/feedback */
 
    /* Disable draw options that might convert points/lines to tris, etc.
@@ -288,14 +287,11 @@ st_init_draw(struct st_context *st)
    draw_wide_point_threshold(st->draw, 1000.0f);
    draw_enable_line_stipple(st->draw, FALSE);
    draw_enable_point_sprites(st->draw, FALSE);
-#endif
 }
 
 
 void
 st_destroy_draw(struct st_context *st)
 {
-#if FEATURE_feedback || 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 820918e51e30462e0165ad14feade3b13cfa605d..a6c7d0eec8530092cb0105039969ed19f7915629 100644 (file)
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -46,8 +46,6 @@
 #include "draw/draw_context.h"
 
 
-#if FEATURE_feedback || FEATURE_rastpos
-
 /**
  * Set the (private) draw module's post-transformed vertex format when in
  * GL_SELECT or GL_FEEDBACK mode or for glRasterPos.
@@ -268,6 +266,3 @@ st_feedback_draw_vbo(struct gl_context *ctx,
    }
    draw_set_vertex_buffers(draw, 0, NULL);
 }
-
-#endif /* FEATURE_feedback || FEATURE_rastpos */
-

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 4eb27fe7056ac53eb86a7ca60b480e990cbd0ac7..ac066a766c9a175b227e9aa7446b28524ae8bc99 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -66,10 +66,8 @@ 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 (vpv->draw_shader)
       draw_delete_vertex_shader( st->draw, vpv->draw_shader );
-#endif
       
    if (vpv->tgsi.tokens)
       st_free_tokens(vpv->tgsi.tokens);