Move guts of vertex array drawing into the 'draw' module.

1 files changed, 4 insertions, 11 deletions

diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 95b0cfee033..eba789e9c42 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -210,22 +210,15 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
       }
    }
 
-   /* If the attributes have changed, tell the draw module (which in turn
-    * tells the vf module) about the new vertex layout.
+   /* If the attributes have changed, tell the draw module about
+    * the new vertex layout.
     */
    if (attr_mask != softpipe->attr_mask) {
       softpipe->attr_mask = attr_mask;
 
-#define USE_NEW_DRAW 01
-#if USE_NEW_DRAW
-      draw_set_vertex_attributes2( softpipe->draw,
-				  slot_to_vf_attr,
-				  softpipe->nr_attrs );
-#else
       draw_set_vertex_attributes( softpipe->draw,
-				  slot_to_vf_attr,
-				  softpipe->nr_attrs );
-#endif
+				 slot_to_vf_attr,
+				 softpipe->nr_attrs );
    }
 }