5 files changed, 3 insertions, 11 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_pipeline.c
index 4c2a281b295..0914a904405 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_pipeline.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_pipeline.c
@@ -211,7 +211,6 @@ fetch_store_general( struct fetch_pipeline_middle_end *fpme,
 static void fetch_pipeline_prepare( struct draw_pt_middle_end *middle,
                                     unsigned prim )
 {
-   static const float zero = 0;
    struct fetch_pipeline_middle_end *fpme = (struct fetch_pipeline_middle_end *)middle;
    struct draw_context *draw = fpme->draw;
    unsigned i, nr = 0;
@@ -264,7 +263,6 @@ static void fetch_pipeline_run( struct draw_pt_middle_end *middle,
                             unsigned draw_count )
 {
    struct fetch_pipeline_middle_end *fpme = (struct fetch_pipeline_middle_end *)middle;
-   struct draw_context *draw = fpme->draw;
    char *pipeline_verts;
    
    pipeline_verts = MALLOC( fpme->pipeline_vertex_size * 
diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
index e7550fe3289..fb9b2da5c07 100644
--- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
+++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
@@ -159,15 +159,6 @@ static void fetch_pipeline_run( struct draw_pt_middle_end *middle,
       return;
    }
 
-   /*FIXME: this init phase should go away */
-   for (i = 0; i < fetch_count; ++i) {
-      struct vertex_header *header =
-         (struct vertex_header*)(pipeline_verts + (fpme->pipeline_vertex_size * i));
-      header->clipmask = 0;
-      header->edgeflag = draw_get_edgeflag(draw, i);
-      header->pad = 0;
-      header->vertex_id = UNDEFINED_VERTEX_ID;
-   }
 
    /* Shade
     */
diff --git a/src/gallium/auxiliary/draw/draw_vs_exec.c b/src/gallium/auxiliary/draw/draw_vs_exec.c
index 6fe4e554d5e..27cf060cc9f 100644
--- a/src/gallium/auxiliary/draw/draw_vs_exec.c
+++ b/src/gallium/auxiliary/draw/draw_vs_exec.c
@@ -135,6 +135,7 @@ vs_exec_run( struct draw_vertex_shader *shader,
             out->clipmask = 0;
          }
          out->edgeflag = 1;
+	 out->vertex_id = UNDEFINED_VERTEX_ID;
 
          if (!draw->identity_viewport) {
             /* Viewport mapping */
diff --git a/src/gallium/auxiliary/draw/draw_vs_llvm.c b/src/gallium/auxiliary/draw/draw_vs_llvm.c
index 72317c67aec..73076d24674 100644
--- a/src/gallium/auxiliary/draw/draw_vs_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_vs_llvm.c
@@ -140,6 +140,7 @@ vs_llvm_run( struct draw_vertex_shader *base,
          vOut[j]->clipmask = 0;
       }
       vOut[j]->edgeflag = 1;
+      vOut[j]->vertex_id = UNDEFINED_VERTEX_ID;
 
       if (!draw->identity_viewport) {
          /* Viewport mapping */
diff --git a/src/gallium/auxiliary/draw/draw_vs_sse.c b/src/gallium/auxiliary/draw/draw_vs_sse.c
index c877f5ee3ab..92b9947e9f0 100644
--- a/src/gallium/auxiliary/draw/draw_vs_sse.c
+++ b/src/gallium/auxiliary/draw/draw_vs_sse.c
@@ -158,6 +158,7 @@ vs_sse_run( struct draw_vertex_shader *base,
             out->clipmask = 0;
          }
          out->edgeflag = 1;
+	 out->vertex_id = UNDEFINED_VERTEX_ID;
 
          if (!draw->identity_viewport) {
             /* Viewport mapping */