1 files changed, 23 insertions, 7 deletions

diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index f5a3bf390e..d6585bbfd0 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -53,12 +53,14 @@ draw_pt_arrays(struct draw_context *draw,
    struct draw_pt_front_end *frontend = NULL;
    struct draw_pt_middle_end *middle = NULL;
    unsigned opt = 0;
+   pt_elt_func get_elt = 0;
+   void *elts          = 0;
 
    if (!draw->render) {
       opt |= PT_PIPELINE;
    }
 
-   if (draw_need_pipeline(draw, 
+   if (draw_need_pipeline(draw,
                           draw->rasterizer,
                           prim)) {
       opt |= PT_PIPELINE;
@@ -78,16 +80,21 @@ draw_pt_arrays(struct draw_context *draw,
       middle = draw->pt.middle.fetch_emit;
 
 
-   /* May create a short-circuited version of this for small primitives:
+   /* Pick the right frontend
     */
-   frontend = draw->pt.front.vcache;
+   if (draw->pt.user.elts ||
+      count >= 256) {
+      frontend = draw->pt.front.vcache;
+      get_elt = draw_pt_elt_func(draw);
+      elts = draw_pt_elt_ptr(draw, start);
+   } else {
+      frontend = draw->pt.front.varray;
+      elts = start;
+   }
 
    frontend->prepare( frontend, prim, middle, opt );
 
-   frontend->run( frontend,
-                  draw_pt_elt_func( draw ),
-                  draw_pt_elt_ptr( draw, start ),
-                  count );
+   frontend->run(frontend, get_elt, elts, count);
 
    frontend->finish( frontend );
 
@@ -101,6 +108,10 @@ boolean draw_pt_init( struct draw_context *draw )
    if (!draw->pt.front.vcache)
       return FALSE;
 
+   draw->pt.front.varray = draw_pt_varray(draw);
+   if (!draw->pt.front.varray)
+      return FALSE;
+
    draw->pt.middle.fetch_emit = draw_pt_fetch_emit( draw );
    if (!draw->pt.middle.fetch_emit)
       return FALSE;
@@ -129,6 +140,11 @@ void draw_pt_destroy( struct draw_context *draw )
       draw->pt.front.vcache->destroy( draw->pt.front.vcache );
       draw->pt.front.vcache = NULL;
    }
+
+   if (draw->pt.front.varray) {
+      draw->pt.front.varray->destroy( draw->pt.front.varray );
+      draw->pt.front.varray = NULL;
+   }
 }