llvmpipe: merge setup and draw vbuf submodules

The setup tiling engine is now plugged directly into the draw module
as a rendering backend.

Removed a couple of layering violations such that the setup code no
longer reaches out into the surrounding llvmpipe state or context.

1 files changed, 25 insertions, 4 deletions

diff --git a/src/gallium/drivers/llvmpipe/lp_setup_context.h b/src/gallium/drivers/llvmpipe/lp_setup_context.h
index f6604a8034..d2278a46e6 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_setup_context.h
@@ -40,6 +40,7 @@
 #include "lp_tile_soa.h"        /* for TILE_SIZE */
 #include "lp_scene.h"
 
+#include "draw/draw_vbuf.h"
 
 #define LP_SETUP_NEW_FS          0x01
 #define LP_SETUP_NEW_CONSTANTS   0x02
@@ -53,15 +54,31 @@ struct lp_scene_queue;
  * Point/line/triangle setup context.
  * Note: "stored" below indicates data which is stored in the bins,
  * not arbitrary malloc'd memory.
+ *
+ *
+ * Subclass of vbuf_render, plugged directly into the draw module as
+ * the rendering backend.
  */
-struct setup_context {
-
+struct setup_context
+{
+   struct vbuf_render base;
+
+   struct vertex_info *vertex_info;
+   uint prim;
+   uint vertex_size;
+   uint nr_vertices;
+   uint vertex_buffer_size;
+   void *vertex_buffer;
+
+   /* Final pipeline stage for draw module.  Draw module should
+    * create/install this itself now.
+    */
+   struct draw_stage *vbuf;
    struct lp_rasterizer *rast;
-
-
    struct lp_scene *scene;               /**< current scene */
    struct lp_scene_queue *empty_scenes;  /**< queue of empty scenes */
 
+   boolean flatshade_first;
    boolean ccw_is_frontface;
    unsigned cullmode;
 
@@ -120,4 +137,8 @@ void lp_setup_choose_point( struct setup_context *setup );
 
 struct lp_scene *lp_setup_get_current_scene(struct setup_context *setup);
 
+void lp_setup_init_vbuf(struct setup_context *setup);
+
+void lp_setup_update_state( struct setup_context *setup );
+
 #endif