6 files changed, 8 insertions, 19 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_clear.c b/src/gallium/drivers/llvmpipe/lp_clear.c
index 4bae44e2ea..3e8c410925 100644
--- a/src/gallium/drivers/llvmpipe/lp_clear.c
+++ b/src/gallium/drivers/llvmpipe/lp_clear.c
@@ -36,7 +36,6 @@
 #include "lp_clear.h"
 #include "lp_context.h"
 #include "lp_setup.h"
-#include "lp_state.h"
 
 
 /**
diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h
index b796148457..194692045d 100644
--- a/src/gallium/drivers/llvmpipe/lp_context.h
+++ b/src/gallium/drivers/llvmpipe/lp_context.h
@@ -88,7 +88,6 @@ struct llvmpipe_context {
    
    /** Vertex format */
    struct vertex_info vertex_info;
-   struct vertex_info vertex_info_vbuf;
 
    /** Which vertex shader output slot contains point size */
    int psize_slot;
diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c
index e6519cb216..9405150c4f 100644
--- a/src/gallium/drivers/llvmpipe/lp_flush.c
+++ b/src/gallium/drivers/llvmpipe/lp_flush.c
@@ -35,7 +35,6 @@
 #include "lp_flush.h"
 #include "lp_context.h"
 #include "lp_surface.h"
-#include "lp_state.h"
 #include "lp_winsys.h"
 #include "lp_setup.h"
 
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c
index 24393c8e89..6772ff332b 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -34,7 +34,6 @@
 #include "lp_scene_queue.h"
 #include "lp_debug.h"
 #include "lp_fence.h"
-#include "lp_state.h"
 #include "lp_rast.h"
 #include "lp_rast_priv.h"
 #include "lp_tile_soa.h"
diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h
index 64fe3600f5..6017dc553a 100644
--- a/src/gallium/drivers/llvmpipe/lp_state.h
+++ b/src/gallium/drivers/llvmpipe/lp_state.h
@@ -215,11 +215,4 @@ void
 llvmpipe_unmap_texture_surfaces(struct llvmpipe_context *lp);
 
 
-struct vertex_info *
-llvmpipe_get_vertex_info(struct llvmpipe_context *llvmpipe);
-
-struct vertex_info *
-llvmpipe_get_vbuf_vertex_info(struct llvmpipe_context *llvmpipe);
-
-
 #endif
diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c
index ab827045ed..cc7b09fd4d 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_derived.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c
@@ -43,29 +43,29 @@
  * (simple float[][4]) used by the 'draw' module into vertices for
  * rasterization.
  *
- * This function validates the vertex layout and returns a pointer to a
- * vertex_info object.
+ * This function validates the vertex layout.
  */
 static void
 compute_vertex_info(struct llvmpipe_context *llvmpipe)
 {
    const struct lp_fragment_shader *lpfs = llvmpipe->fs;
-   struct vertex_info *vinfo_vbuf = &llvmpipe->vertex_info_vbuf;
+   struct vertex_info *vinfo = &llvmpipe->vertex_info;
    const uint num = draw_num_vs_outputs(llvmpipe->draw);
    uint i;
 
-   /* Tell draw_vbuf to simply emit the whole post-xform vertex as-is.
+   /* Tell setup to tell the draw module to simply emit the whole
+    * post-xform vertex as-is.
     *
     * Not really sure if this is the best approach.
     */
-   vinfo_vbuf->num_attribs = 0;
+   vinfo->num_attribs = 0;
    for (i = 0; i < num; i++) {
-      draw_emit_vertex_attr(vinfo_vbuf, EMIT_4F, INTERP_PERSPECTIVE, i);
+      draw_emit_vertex_attr(vinfo, EMIT_4F, INTERP_PERSPECTIVE, i);
    }
-   draw_compute_vertex_size(vinfo_vbuf);
+   draw_compute_vertex_size(vinfo);
 
 
-   lp_setup_set_vertex_info(llvmpipe->setup, vinfo_vbuf);
+   lp_setup_set_vertex_info(llvmpipe->setup, vinfo);
 
 /*
    llvmpipe->psize_slot = draw_find_vs_output(llvmpipe->draw,