3 files changed, 10 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index 11ba5d56f30..ea0fa20012e 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -144,9 +144,11 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
          }
 
          if (stvp->draw_shader) {
+#if FEATURE_feedback || FEATURE_drawpix
             /* this would only have been allocated for the RasterPos path */
             draw_delete_vertex_shader(st->draw, stvp->draw_shader);
             stvp->draw_shader = NULL;
+#endif
          }
 
          if (stvp->state.tokens) {
@@ -232,9 +234,11 @@ static void st_program_string_notify( GLcontext *ctx,
       }
 
       if (stvp->draw_shader) {
+#if FEATURE_feedback || FEATURE_drawpix
          /* this would only have been allocated for the RasterPos path */
          draw_delete_vertex_shader(st->draw, stvp->draw_shader);
          stvp->draw_shader = NULL;
+#endif
       }
 
       if (stvp->state.tokens) {
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index bf78cacb8ea..8b30e35684b 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -98,6 +98,7 @@ st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe )
    /* state tracker needs the VBO module */
    _vbo_CreateContext(ctx);
 
+#if FEATURE_feedback || FEATURE_drawpix
    st->draw = draw_create(); /* for selection/feedback */
 
    /* Disable draw options that might convert points/lines to tris, etc.
@@ -107,6 +108,7 @@ st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe )
    draw_wide_point_threshold(st->draw, 1000.0f);
    draw_enable_line_stipple(st->draw, FALSE);
    draw_enable_point_sprites(st->draw, FALSE);
+#endif
 
    st->dirty.mesa = ~0;
    st->dirty.st = ~0;
@@ -164,7 +166,9 @@ static void st_destroy_context_priv( struct st_context *st )
 {
    uint i;
 
+#if FEATURE_feedback || FEATURE_drawpix
    draw_destroy(st->draw);
+#endif
    st_destroy_atoms( st );
    st_destroy_draw( st );
    st_destroy_generate_mipmap(st);
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index a57d7b6a7aa..30c2bdb723f 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -447,6 +447,7 @@ st_draw_vbo(GLcontext *ctx,
 }
 
 
+#if FEATURE_feedback || FEATURE_drawpix
 
 /**
  * Set the (private) draw module's post-transformed vertex format when in
@@ -657,6 +658,7 @@ st_feedback_draw_vbo(GLcontext *ctx,
    }
 }
 
+#endif /* FEATURE_feedback || FEATURE_drawpix */
 
 
 void st_init_draw( struct st_context *st )