New 'draw' module for primitive drawing (clipping, culling, etc).

10 files changed, 92 insertions, 172 deletions

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 6bd1d9f16e..9becab4918 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -29,14 +29,14 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "imports.h"
-#include "macros.h"
-
+#include "main/imports.h"
+#include "main/macros.h"
+#include "pipe/draw/draw_context.h"
 #include "sp_context.h"
 #include "sp_clear.h"
-#include "sp_prim.h"
 #include "sp_state.h"
-#include "sp_draw.h"
+#include "sp_prim_setup.h"
+
 
 static void softpipe_destroy( struct pipe_context *pipe )
 {
@@ -44,7 +44,7 @@ static void softpipe_destroy( struct pipe_context *pipe )
 
    draw_destroy( softpipe->draw );
 
-   FREE( softpipe );
+   free( softpipe );
 }
 
 
@@ -59,6 +59,7 @@ static void softpipe_draw_vb( struct pipe_context *pipe,
    draw_vb( softpipe->draw, VB );
 }
 
+
 struct pipe_context *softpipe_create( void )
 {
    struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);
@@ -81,64 +82,17 @@ struct pipe_context *softpipe_create( void )
    softpipe->pipe.draw_vb = softpipe_draw_vb;
    softpipe->pipe.clear = softpipe_clear;
 
-
-   softpipe->prim.setup     = prim_setup( softpipe );
-   softpipe->prim.unfilled  = prim_unfilled( softpipe );
-   softpipe->prim.twoside   = prim_twoside( softpipe );
-   softpipe->prim.offset    = prim_offset( softpipe );
-   softpipe->prim.clip      = prim_clip( softpipe );
-   softpipe->prim.flatshade = prim_flatshade( softpipe );
-   softpipe->prim.cull      = prim_cull( softpipe );
-
+   softpipe->quad.shade = sp_quad_shade_stage(softpipe);
+   softpipe->quad.alpha_test = sp_quad_alpha_test_stage(softpipe);
    softpipe->quad.blend = sp_quad_blend_stage(softpipe);
    softpipe->quad.depth_test = sp_quad_depth_test_stage(softpipe);
-   softpipe->quad.shade = sp_quad_shade_stage(softpipe);
    softpipe->quad.output = sp_quad_output_stage(softpipe);
 
-   softpipe->draw = draw_create( softpipe );
-
-   ASSIGN_4V( softpipe->plane[0], -1,  0,  0, 1 );
-   ASSIGN_4V( softpipe->plane[1],  1,  0,  0, 1 );
-   ASSIGN_4V( softpipe->plane[2],  0, -1,  0, 1 );
-   ASSIGN_4V( softpipe->plane[3],  0,  1,  0, 1 );
-   ASSIGN_4V( softpipe->plane[4],  0,  0,  1, 1 ); /* yes these are correct */
-   ASSIGN_4V( softpipe->plane[5],  0,  0, -1, 1 ); /* mesa's a bit wonky */
-   softpipe->nr_planes = 6;
+   /*
+    * Create drawing context and plug our render/setup stage into it.
+    */
+   softpipe->draw = draw_create();
+   draw_set_setup_stage(softpipe->draw, prim_setup(softpipe));
 
    return &softpipe->pipe;
 }
-
-
-
-
-
-
-#define MAX_VERTEX_SIZE ((2 + FRAG_ATTRIB_MAX) * 4 * sizeof(GLfloat))
-
-void prim_alloc_tmps( struct prim_stage *stage, GLuint nr )
-{
-   stage->nr_tmps = nr;
-
-   if (nr) {
-      GLubyte *store = MALLOC(MAX_VERTEX_SIZE * nr);
-      GLuint i;
-
-      stage->tmp = MALLOC(sizeof(struct vertex_header *) * nr);
-      
-      for (i = 0; i < nr; i++)
-	 stage->tmp[i] = (struct vertex_header *)(store + i * MAX_VERTEX_SIZE);
-   }
-}
-
-void prim_free_tmps( struct prim_stage *stage )
-{
-   if (stage->tmp) {
-      FREE(stage->tmp[0]);
-      FREE(stage->tmp);
-   }
-}
-
-
-
-
-
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 40688208e0..0c082978bd 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -55,7 +55,6 @@ enum interp_mode {
 #define G_NEW_SETUP     0x2
 #define G_NEW_FS        0x4
 #define G_NEW_BLEND     0x8
-#define G_NEW_POINT     0x10
 #define G_NEW_CLIP      0x20
 #define G_NEW_SCISSOR   0x40
 #define G_NEW_STIPPLE   0x80
@@ -66,12 +65,9 @@ enum interp_mode {
 #define G_NEW_TEXTURE    0x1000
 
 
-#define PIPE_ATTRIB_MAX 32
-
 struct softpipe_context {     
    struct pipe_context pipe;
 
-
    /* The most recent drawing state as set by the driver:
     */
    struct pipe_alpha_test_state alpha_test;
@@ -90,11 +86,6 @@ struct softpipe_context {
    struct pipe_viewport_state viewport;
    GLuint dirty;
 
-   /* Clip derived state:
-    */
-   GLfloat plane[12][4];
-   GLuint nr_planes;
-
    /* Setup derived state.  TODO: this should be passed in the program
     * tokens as parameters to DECL instructions.
     * 
@@ -119,24 +110,6 @@ struct softpipe_context {
     */
    GLubyte stipple_masks[16][16];
 
-
-   /* The software clipper/setup engine.  
-    */
-   struct {
-      struct prim_stage *setup;
-      struct prim_stage *unfilled;
-      struct prim_stage *twoside;
-      struct prim_stage *clip;
-      struct prim_stage *flatshade;
-      struct prim_stage *offset;
-      struct prim_stage *cull;
-
-      struct prim_stage *first;
-
-      GLenum prim;
-      GLuint vertex_size;
-   } prim;
-
    /*
     * Software quad rendering pipeline
     */
diff --git a/src/mesa/pipe/softpipe/sp_headers.h b/src/mesa/pipe/softpipe/sp_headers.h
index 96ff52a453..561597d9e2 100644
--- a/src/mesa/pipe/softpipe/sp_headers.h
+++ b/src/mesa/pipe/softpipe/sp_headers.h
@@ -34,27 +34,6 @@
 #define PRIM_LINE  2
 #define PRIM_TRI   3
 
-struct prim_header {
-   GLfloat det;
-   struct vertex_header *v[3];
-};
-
-/* Carry some useful information around with the vertices in the prim
- * pipe.  
- */
-struct vertex_header {
-   GLuint clipmask:12;
-   GLuint edgeflag:1;
-   GLuint pad:19;
-
-   GLfloat clip[4];
-
-   GLfloat data[][4];		/* Note variable size */
-};
-
-
-
-
 
 /* The rasterizer generates 2x2 quads of fragment and feeds them to
  * the current fp_machine (see below).  
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c
index 3f4602feb0..ea10ef53a0 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.c
@@ -32,8 +32,10 @@
 #include "macros.h"
 
 #include "sp_context.h"
-#include "sp_prim.h"
+#include "sp_headers.h"
+#include "pipe/draw/draw_private.h"
 #include "sp_quad.h"
+#include "sp_prim_setup.h"
 
 
 
@@ -66,7 +68,10 @@ struct edge {
  * Also used for line drawing (taking some liberties).
  */
 struct setup_stage {
-   struct prim_stage stage; /**< This must be first */
+   struct prim_stage stage; /**< This must be first (base class) */
+
+   /*XXX NEW */
+   struct softpipe_context *softpipe;
 
    /* Vertices are just an array of floats making up each attribute in
     * turn.  Currently fixed at 4 floats, but should change in time.
@@ -119,7 +124,9 @@ static inline GLint block( GLint x )
 
 static void setup_begin( struct prim_stage *stage )
 {
-   setup_stage(stage)->quad.nr_attrs = stage->softpipe->nr_frag_attrs;
+   struct setup_stage *setup = setup_stage(stage);
+
+   setup->quad.nr_attrs = setup->softpipe->nr_frag_attrs;
 }
 
 
@@ -133,7 +140,7 @@ static void run_shader_block( struct setup_stage *setup,
    setup->quad.y0 = y;
    setup->quad.mask = mask;
 
-   quad_emit(setup->stage.softpipe, &setup->quad);
+   quad_emit(setup->/*stage.*/softpipe, &setup->quad);
 }
 
 
@@ -387,7 +394,7 @@ static void tri_persp_coeff( struct setup_stage *setup,
  */
 static void setup_tri_coefficients( struct setup_stage *setup )
 {
-   const enum interp_mode *interp = setup->stage.softpipe->interp;
+   const enum interp_mode *interp = setup->/*stage.*/softpipe->interp;
    GLuint slot, j;
 
    /* z and w are done by linear interpolation:
@@ -462,15 +469,15 @@ static void subtriangle( struct setup_stage *setup,
 
    /* scissor y:
     */
-   if (setup->stage.softpipe->setup.scissor) {
+   if (setup->/*stage.*/softpipe->setup.scissor) {
       start_y = sy;
       finish_y = start_y + lines;
 
-      if (start_y < setup->stage.softpipe->scissor.miny) 
-	 start_y = setup->stage.softpipe->scissor.miny;
+      if (start_y < setup->/*stage.*/softpipe->scissor.miny) 
+	 start_y = setup->/*stage.*/softpipe->scissor.miny;
 
-      if (finish_y > setup->stage.softpipe->scissor.maxy) 
-	 finish_y = setup->stage.softpipe->scissor.maxy;
+      if (finish_y > setup->/*stage.*/softpipe->scissor.maxy) 
+	 finish_y = setup->/*stage.*/softpipe->scissor.maxy;
 
       start_y -= sy;
       finish_y -= sy;
@@ -495,12 +502,12 @@ static void subtriangle( struct setup_stage *setup,
 
       /* scissor x: 
        */
-      if (setup->stage.softpipe->setup.scissor) {
-	 if (left  < setup->stage.softpipe->scissor.minx) 
-	    left  = setup->stage.softpipe->scissor.minx;
+      if (setup->/*stage.*/softpipe->setup.scissor) {
+	 if (left  < setup->/*stage.*/softpipe->scissor.minx) 
+	    left  = setup->/*stage.*/softpipe->scissor.minx;
 
-	 if (right > setup->stage.softpipe->scissor.maxx) 
-	    right = setup->stage.softpipe->scissor.maxx;
+	 if (right > setup->/*stage.*/softpipe->scissor.maxx) 
+	    right = setup->/*stage.*/softpipe->scissor.maxx;
       }
 
       if (left < right) {
@@ -604,7 +611,7 @@ line_persp_coeff(struct setup_stage *setup, GLuint slot, GLuint i)
 static INLINE void
 setup_line_coefficients(struct setup_stage *setup, struct prim_header *prim)
 {
-   const enum interp_mode *interp = setup->stage.softpipe->interp;
+   const enum interp_mode *interp = setup->/*stage.*/softpipe->interp;
    GLuint slot, j;
 
    /* use setup->vmin, vmax to point to vertices */
@@ -664,7 +671,7 @@ plot(struct setup_stage *setup, GLint x, GLint y)
       /* flush prev quad, start new quad */
 
       if (setup->quad.x0 != -1) 
-	 quad_emit(setup->stage.softpipe, &setup->quad);
+	 quad_emit(setup->/*stage.*/softpipe, &setup->quad);
 
       setup->quad.x0 = quadX;
       setup->quad.y0 = quadY;
@@ -767,7 +774,7 @@ setup_line(struct prim_stage *stage, struct prim_header *prim)
 
    /* draw final quad */
    if (setup->quad.mask) {
-      quad_emit(setup->stage.softpipe, &setup->quad);
+      quad_emit(setup->/*stage.*/softpipe, &setup->quad);
    }
 }
 
@@ -782,8 +789,8 @@ setup_point(struct prim_stage *stage, struct prim_header *prim)
 {
    struct setup_stage *setup = setup_stage( stage );
    /*XXX this should be a vertex attrib! */
-   GLfloat halfSize = 0.5 * setup->stage.softpipe->setup.point_size;
-   GLboolean round = setup->stage.softpipe->setup.point_smooth;
+   GLfloat halfSize = 0.5 * setup->/*stage.*/softpipe->setup.point_size;
+   GLboolean round = setup->/*stage.*/softpipe->setup.point_smooth;
    const struct vertex_header *v0 = prim->v[0];
    const GLfloat x = v0->data[FRAG_ATTRIB_WPOS][0];
    const GLfloat y = v0->data[FRAG_ATTRIB_WPOS][1];
@@ -822,7 +829,7 @@ setup_point(struct prim_stage *stage, struct prim_header *prim)
       setup->quad.x0 = x - ix;
       setup->quad.y0 = y - iy;
       setup->quad.mask = (1 << ix) << (2 * iy);
-      quad_emit(setup->stage.softpipe, &setup->quad);
+      quad_emit(setup->/*stage.*/softpipe, &setup->quad);
    }
    else {
       const GLint ixmin = block((GLint) (x - halfSize));
@@ -882,7 +889,7 @@ setup_point(struct prim_stage *stage, struct prim_header *prim)
             if (setup->quad.mask) {
                setup->quad.x0 = ix;
                setup->quad.y0 = iy;
-               quad_emit( setup->stage.softpipe, &setup->quad );
+               quad_emit( setup->/*stage.*/softpipe, &setup->quad );
             }
          }
       }
@@ -900,7 +907,8 @@ struct prim_stage *prim_setup( struct softpipe_context *softpipe )
 {
    struct setup_stage *setup = CALLOC_STRUCT(setup_stage);
 
-   setup->stage.softpipe = softpipe;
+   setup->softpipe = softpipe;
+   setup->stage.draw = softpipe->draw;
    setup->stage.begin = setup_begin;
    setup->stage.point = setup_point;
    setup->stage.line = setup_line;
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.h b/src/mesa/pipe/softpipe/sp_prim_setup.h
index 40a70c543e..4d26c05458 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.h
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.h
@@ -37,11 +37,16 @@
 
 #include "glheader.h"
 #include "imports.h"
+#if 0
 #include "s_tri_public.h"
+#endif
 #include "s_context.h"
 
 
+extern struct prim_stage *prim_setup( struct softpipe_context *softpipe );
+
 
+#if 0 /* UNUSED? */
 struct tri_context;
 struct fp_context;
 struct be_context;
@@ -119,3 +124,4 @@ void tri_rasterize_spans( struct tri_context *tri );
 
 #endif
 #endif
+#endif
diff --git a/src/mesa/pipe/softpipe/sp_state_blend.c b/src/mesa/pipe/softpipe/sp_state_blend.c
index 6ca42e8a01..e0ff549d70 100644
--- a/src/mesa/pipe/softpipe/sp_state_blend.c
+++ b/src/mesa/pipe/softpipe/sp_state_blend.c
@@ -31,8 +31,6 @@
 
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_draw.h"
-
 
 
 void softpipe_set_blend_state( struct pipe_context *pipe,
diff --git a/src/mesa/pipe/softpipe/sp_state_clip.c b/src/mesa/pipe/softpipe/sp_state_clip.c
index c907550019..3b69d3e7a7 100644
--- a/src/mesa/pipe/softpipe/sp_state_clip.c
+++ b/src/mesa/pipe/softpipe/sp_state_clip.c
@@ -31,8 +31,7 @@
 
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_draw.h"
-
+#include "pipe/draw/draw_context.h"
 
 
 void softpipe_set_clip_state( struct pipe_context *pipe,
@@ -40,10 +39,8 @@ void softpipe_set_clip_state( struct pipe_context *pipe,
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
-   memcpy(&softpipe->plane[6], clip->ucp, clip->nr * sizeof(clip->ucp[0]));
-
-   softpipe->nr_planes = 6 + clip->nr;
-   softpipe->dirty |= G_NEW_CLIP;
+   /* pass the clip state to the draw module */
+   draw_set_clip_state(softpipe->draw, clip);
 }
 
 
@@ -57,13 +54,32 @@ void softpipe_set_viewport_state( struct pipe_context *pipe,
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
    softpipe->viewport = *viewport; /* struct copy */
+   softpipe->dirty |= G_NEW_VIEWPORT;
+
+   /* pass the viewport info to the draw module */
+   draw_set_viewport_state(softpipe->draw, viewport);
 
    /* Using tnl/ and vf/ modules is temporary while getting started.
     * Full pipe will have vertex shader, vertex fetch of its own.
     */
-   draw_set_viewport( softpipe->draw, viewport->scale, viewport->translate );
-   softpipe->dirty |= G_NEW_VIEWPORT;
 }
 
 
+void softpipe_set_scissor_state( struct pipe_context *pipe,
+                                 const struct pipe_scissor_state *scissor )
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
+
+   memcpy( &softpipe->scissor, scissor, sizeof(*scissor) );
+   softpipe->dirty |= G_NEW_SCISSOR;
+}
+
+
+void softpipe_set_polygon_stipple( struct pipe_context *pipe,
+                                   const struct pipe_poly_stipple *stipple )
+{
+   struct softpipe_context *softpipe = softpipe_context(pipe);
 
+   memcpy( &softpipe->poly_stipple, stipple, sizeof(*stipple) );
+   softpipe->dirty |= G_NEW_STIPPLE;
+}
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 5aee4be6b8..4454dd9ba9 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -25,17 +25,17 @@
  * 
  **************************************************************************/
 
-#include "glheader.h"
-#include "macros.h"
-#include "enums.h"
-#include "program.h"
+#include "main/glheader.h"
+#include "main/macros.h"
+#include "main/enums.h"
+#include "shader/program.h"
 
 #include "vf/vf.h"
-
+#include "pipe/draw/draw_context.h"
 #include "sp_context.h"
-#include "sp_draw.h"
 #include "sp_state.h"
 
+
 #define EMIT_ATTR( ATTR, FRAG_ATTR, INTERP )			\
 do {							\
    slot_to_vf_attr[softpipe->nr_attrs] = ATTR;	\
@@ -77,8 +77,8 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
    softpipe->nr_attrs = 0;
    memset(slot_to_vf_attr, 0, sizeof(slot_to_vf_attr));
 
-   memset(softpipe->fp_attr_to_slot, 0, sizeof(softpipe->vf_attr_to_slot));
-   memset(softpipe->vf_attr_to_slot, 0, sizeof(softpipe->fp_attr_to_slot));
+   memset(softpipe->fp_attr_to_slot, 0, sizeof(softpipe->fp_attr_to_slot));
+   memset(softpipe->vf_attr_to_slot, 0, sizeof(softpipe->vf_attr_to_slot));
 
    /* TODO - Figure out if we need to do perspective divide, etc.
     */
diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c
index 060e2c8c98..62ff5c50b8 100644
--- a/src/mesa/pipe/softpipe/sp_state_sampler.c
+++ b/src/mesa/pipe/softpipe/sp_state_sampler.c
@@ -28,11 +28,11 @@
 /* Authors:
  *  Brian Paul
  */
+
 #include "imports.h"
 
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_draw.h"
 
 
 
diff --git a/src/mesa/pipe/softpipe/sp_state_setup.c b/src/mesa/pipe/softpipe/sp_state_setup.c
index 55803aeac5..2dea49c86d 100644
--- a/src/mesa/pipe/softpipe/sp_state_setup.c
+++ b/src/mesa/pipe/softpipe/sp_state_setup.c
@@ -28,11 +28,10 @@
 #include "pipe/p_defines.h"
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_prim.h"
-
-
+#include "pipe/draw/draw_context.h"
 
 
+#if 0
 static void validate_prim_pipe( struct softpipe_context *softpipe )
 {
    struct prim_stage *next = softpipe->prim.setup;
@@ -87,6 +86,7 @@ static void validate_prim_pipe( struct softpipe_context *softpipe )
    softpipe->prim.first = next;
 }
 
+#endif
 
 
 
@@ -95,29 +95,15 @@ void softpipe_set_setup_state( struct pipe_context *pipe,
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
+   /* pass-through to draw module */
+   draw_set_setup_state(softpipe->draw, setup);
+
    memcpy( &softpipe->setup, setup, sizeof(*setup) );
 
+#if 0
    validate_prim_pipe( softpipe );
+#endif
    softpipe->dirty |= G_NEW_SETUP;
 }
 
 
-
-void softpipe_set_scissor_state( struct pipe_context *pipe,
-                                 const struct pipe_scissor_state *scissor )
-{
-   struct softpipe_context *softpipe = softpipe_context(pipe);
-
-   memcpy( &softpipe->scissor, scissor, sizeof(*scissor) );
-   softpipe->dirty |= G_NEW_SCISSOR;
-}
-
-
-void softpipe_set_polygon_stipple( struct pipe_context *pipe,
-				  const struct pipe_poly_stipple *stipple )
-{
-   struct softpipe_context *softpipe = softpipe_context(pipe);
-
-   memcpy( &softpipe->poly_stipple, stipple, sizeof(*stipple) );
-   softpipe->dirty |= G_NEW_STIPPLE;
-}