Checkpoint: remove more of the old draw_vb() code.

2 files changed, 4 insertions, 42 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 91ede05c05a..ab9becc99e2 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -195,44 +195,6 @@ static void softpipe_destroy( struct pipe_context *pipe )
 }
 
 
-#if 0
-static void softpipe_draw_vb( struct pipe_context *pipe,
-			     struct vertex_buffer *VB )
-{
-   struct softpipe_context *softpipe = softpipe_context( pipe );
-
-   if (softpipe->dirty)
-      softpipe_update_derived( softpipe );
-
-   /* XXX move mapping/unmapping to higher/coarser level? */
-   softpipe_map_surfaces(softpipe);
-   draw_vb( softpipe->draw, VB );
-   softpipe_unmap_surfaces(softpipe);
-}
-#endif
-
-
-static void
-softpipe_draw_vertices(struct pipe_context *pipe,
-                       unsigned mode,
-                       unsigned numVertex, const float *verts,
-                       unsigned numAttribs, const unsigned attribs[])
-{
-   struct softpipe_context *softpipe = softpipe_context( pipe );
-
-   if (softpipe->dirty)
-      softpipe_update_derived( softpipe );
-
-   /* XXX move mapping/unmapping to higher/coarser level? */
-   softpipe_map_surfaces(softpipe);
-#if 0
-   draw_vertices(softpipe->draw, mode, numVertex, verts, numAttribs, attribs);
-#endif
-   softpipe_unmap_surfaces(softpipe);
-}
-
-
-
 static void softpipe_reset_occlusion_counter(struct pipe_context *pipe)
 {
    struct softpipe_context *softpipe = softpipe_context( pipe );
@@ -289,10 +251,6 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
    softpipe->pipe.set_vertex_buffer = softpipe_set_vertex_buffer;
    softpipe->pipe.set_vertex_element = softpipe_set_vertex_element;
 
-#if 0
-   softpipe->pipe.draw_vb = softpipe_draw_vb;
-   softpipe->pipe.draw_vertices = softpipe_draw_vertices;
-#endif
    softpipe->pipe.draw_arrays = softpipe_draw_arrays;
    softpipe->pipe.draw_elements = softpipe_draw_elements;
 
diff --git a/src/mesa/pipe/softpipe/sp_state_vertex.c b/src/mesa/pipe/softpipe/sp_state_vertex.c
index 18852552eb3..09ff540ccfd 100644
--- a/src/mesa/pipe/softpipe/sp_state_vertex.c
+++ b/src/mesa/pipe/softpipe/sp_state_vertex.c
@@ -27,10 +27,14 @@
 
 /* Authors:  Keith Whitwell <[email protected]>
  */
+
+
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_surface.h"
 
+#include "pipe/draw/draw_context.h"
+
 
 void
 softpipe_set_vertex_element(struct pipe_context *pipe,