1 files changed, 31 insertions, 9 deletions

diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h
index bc11259cb2..c732d723a7 100644
--- a/src/gallium/auxiliary/draw/draw_private.h
+++ b/src/gallium/auxiliary/draw/draw_private.h
@@ -44,10 +44,12 @@
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 
-#include "x86/rtasm/x86sse.h"
+#include "rtasm/rtasm_x86sse.h"
 #include "tgsi/exec/tgsi_exec.h"
+#include "tgsi/util/tgsi_scan.h"
 
 
+struct pipe_context;
 struct gallivm_prog;
 struct gallivm_cpu_engine;
 
@@ -119,7 +121,7 @@ struct draw_stage
 };
 
 
-#define PRIM_QUEUE_LENGTH      16
+#define PRIM_QUEUE_LENGTH      32
 #define VCACHE_SIZE            32
 #define VCACHE_OVERFLOW        4
 #define VS_QUEUE_LENGTH        (VCACHE_SIZE + VCACHE_OVERFLOW + 1)	/* can never fill up */
@@ -133,6 +135,8 @@ struct draw_vertex_shader {
     */
    const struct pipe_shader_state   *state;
 
+   struct tgsi_shader_info info;
+
    void (*prepare)( struct draw_vertex_shader *shader,
 		    struct draw_context *draw );
 
@@ -179,7 +183,11 @@ struct draw_context
       struct draw_stage *offset;
       struct draw_stage *unfilled;
       struct draw_stage *stipple;
-      struct draw_stage *wide;
+      struct draw_stage *aapoint;
+      struct draw_stage *aaline;
+      struct draw_stage *pstipple;
+      struct draw_stage *wide_line;
+      struct draw_stage *wide_point;
       struct draw_stage *rasterize;
    } pipeline;
 
@@ -211,10 +219,18 @@ struct draw_context
    float plane[12][4];
    unsigned nr_planes;
 
-   boolean convert_wide_points; /**< convert wide points to tris? */
-   boolean convert_wide_lines;  /**< convert side lines to tris? */
+   float wide_point_threshold; /**< convert pnts to tris if larger than this */
+   float wide_line_threshold;  /**< convert lines to tris if wider than this */
    boolean use_sse;
 
+   /* If a prim stage introduces new vertex attributes, they'll be stored here
+    */
+   struct {
+      uint semantic_name;
+      uint semantic_index;
+      int slot;
+   } extra_vp_outputs;
+
    unsigned reduced_prim;
 
    /** TGSI program interpreter runtime state */
@@ -234,8 +250,12 @@ struct draw_context
     */
    struct {
       unsigned referenced;  /**< bitfield */
-      unsigned idx[VCACHE_SIZE + VCACHE_OVERFLOW];
-      struct vertex_header *vertex[VCACHE_SIZE + VCACHE_OVERFLOW];
+
+      struct {
+	 unsigned in;		/* client array element */
+	 unsigned out;		/* index in vs queue/array */
+      } idx[VCACHE_SIZE + VCACHE_OVERFLOW];
+
       unsigned overflow;
 
       /** To find space in the vertex cache: */
@@ -248,9 +268,10 @@ struct draw_context
    struct {
       struct {
 	 unsigned elt;   /**< index into the user's vertex arrays */
-	 struct vertex_header *dest; /**< points into vcache.vertex[] array */
+	 struct vertex_header *vertex;
       } queue[VS_QUEUE_LENGTH];
       unsigned queue_nr;
+      unsigned post_nr;
    } vs;
 
    /**
@@ -284,7 +305,8 @@ extern struct draw_stage *draw_clip_stage( struct draw_context *context );
 extern struct draw_stage *draw_flatshade_stage( struct draw_context *context );
 extern struct draw_stage *draw_cull_stage( struct draw_context *context );
 extern struct draw_stage *draw_stipple_stage( struct draw_context *context );
-extern struct draw_stage *draw_wide_stage( struct draw_context *context );
+extern struct draw_stage *draw_wide_line_stage( struct draw_context *context );
+extern struct draw_stage *draw_wide_point_stage( struct draw_context *context );
 extern struct draw_stage *draw_validate_stage( struct draw_context *context );