fix merge

diff --git a/src/mesa/pipe/draw/draw_feedback.c b/src/mesa/pipe/draw/draw_feedback.c
index 15fad4d..ee54db0 100644 (file)
--- a/src/mesa/pipe/draw/draw_feedback.c
+++ b/src/mesa/pipe/draw/draw_feedback.c
@@ -69,8 +69,6 @@ static void
 feedback_vertex(struct draw_stage *stage, const struct vertex_header *vertex)
 {
    struct feedback_stage *fs = (struct feedback_stage *) stage;
-
-#if 0
    const struct pipe_feedback_state *feedback = &stage->draw->feedback;
    const uint select = feedback->interleaved ? 0 : 1;
    uint i;