remove usage of vertex_header

1 files changed, 122 insertions, 101 deletions

diff --git a/src/gallium/drivers/softpipe/sp_prim_vbuf.c b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
index d940718ed2..025a0113bf 100644
--- a/src/gallium/drivers/softpipe/sp_prim_vbuf.c
+++ b/src/gallium/drivers/softpipe/sp_prim_vbuf.c
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,7 +22,7 @@
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  **************************************************************************/
 
 /**
@@ -30,7 +30,7 @@
  * softpipe rendering pipeline.
  * Probably not desired in general, but useful for testing/debuggin.
  * Enabled/Disabled with SP_VBUF env var.
- * 
+ *
  * Authors
  *  Brian Paul
  */
@@ -39,14 +39,16 @@
 #include "sp_context.h"
 #include "sp_state.h"
 #include "sp_prim_vbuf.h"
+#include "sp_prim_setup.h"
+#include "sp_setup.h"
 #include "draw/draw_context.h"
-#include "draw/draw_private.h"
 #include "draw/draw_vbuf.h"
 
 
 #define SP_MAX_VBUF_INDEXES 1024
 #define SP_MAX_VBUF_SIZE    4096
 
+typedef const float (*cptrf4)[4];
 
 /**
  * Subclass of vbuf_render.
@@ -69,7 +71,6 @@ softpipe_vbuf_render(struct vbuf_render *vbr)
 }
 
 
-
 static const struct vertex_info *
 sp_vbuf_get_vertex_info(struct vbuf_render *vbr)
 {
@@ -91,7 +92,7 @@ sp_vbuf_allocate_vertices(struct vbuf_render *vbr,
 
 
 static void
-sp_vbuf_release_vertices(struct vbuf_render *vbr, void *vertices, 
+sp_vbuf_release_vertices(struct vbuf_render *vbr, void *vertices,
                            unsigned vertex_size, unsigned vertices_used)
 {
    struct softpipe_vbuf_render *cvbr = softpipe_vbuf_render(vbr);
@@ -114,7 +115,7 @@ sp_vbuf_set_primitive(struct vbuf_render *vbr, unsigned prim)
    else {
       return FALSE;
    }
-      
+
 }
 
 
@@ -122,22 +123,19 @@ sp_vbuf_set_primitive(struct vbuf_render *vbr, unsigned prim)
  * Recalculate prim's determinant.
  * XXX is this needed?
  */
-static void
-calc_det(struct prim_header *header)
+static float
+calc_det( const float (*v0)[4],
+          const float (*v1)[4],
+          const float (*v2)[4] )
 {
-   /* Window coords: */
-   const float *v0 = header->v[0]->data[0];
-   const float *v1 = header->v[1]->data[0];
-   const float *v2 = header->v[2]->data[0];
-
    /* edge vectors e = v0 - v2, f = v1 - v2 */
-   const float ex = v0[0] - v2[0];
-   const float ey = v0[1] - v2[1];
-   const float fx = v1[0] - v2[0];
-   const float fy = v1[1] - v2[1];
-   
+   const float ex = v0[0][0] - v2[0][0];
+   const float ey = v0[0][1] - v2[0][1];
+   const float fx = v1[0][0] - v2[0][0];
+   const float fy = v1[0][1] - v2[0][1];
+
    /* det = cross(e,f).z */
-   header->det = ex * fy - ey * fx;
+   return ex * fy - ey * fx;
 }
 
 
@@ -147,48 +145,51 @@ sp_vbuf_draw(struct vbuf_render *vbr, const ushort *indices, uint nr_indices)
    struct softpipe_vbuf_render *cvbr = softpipe_vbuf_render(vbr);
    struct softpipe_context *softpipe = cvbr->softpipe;
    struct draw_stage *setup = softpipe->setup;
-   struct prim_header prim;
    unsigned vertex_size = softpipe->vertex_info_vbuf.size * sizeof(float);
    unsigned i, j;
    void *vertex_buffer = cvbr->vertex_buffer;
-
-   prim.det = 0;
-   prim.reset_line_stipple = 0;
-   prim.edgeflags = 0;
-   prim.pad = 0;
+   cptrf4 v[3];
+   struct setup_context *setup_ctx = sp_draw_setup_context(setup);
 
    switch (cvbr->prim) {
    case PIPE_PRIM_TRIANGLES:
       for (i = 0; i < nr_indices; i += 3) {
-         for (j = 0; j < 3; j++) 
-            prim.v[j] = (struct vertex_header *)((char *)vertex_buffer + 
-                                                 indices[i+j] * vertex_size);
-         
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         for (j = 0; j < 3; j++)
+            v[j] = (cptrf4)((char *)vertex_buffer +
+                             indices[i+j] * vertex_size);
+
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2]);
       }
       break;
 
    case PIPE_PRIM_LINES:
       for (i = 0; i < nr_indices; i += 2) {
-         for (j = 0; j < 2; j++) 
-            prim.v[j] = (struct vertex_header *)((char *)vertex_buffer + 
-                                                 indices[i+j] * vertex_size);
-         
-         setup->line( setup, &prim );
+         for (j = 0; j < 2; j++)
+            v[j] = (cptrf4)((char *)vertex_buffer +
+                            indices[i+j] * vertex_size);
+
+         setup_line( setup_ctx,
+                     v[0],
+                     v[1] );
       }
       break;
 
    case PIPE_PRIM_POINTS:
       for (i = 0; i < nr_indices; i++) {
-         prim.v[0] = (struct vertex_header *)((char *)vertex_buffer + 
-                                              indices[i] * vertex_size);         
-         setup->point( setup, &prim );
+         v[0] = (cptrf4)((char *)vertex_buffer +
+                         indices[i] * vertex_size);
+
+         setup_point( setup_ctx,
+                      v[0] );
       }
       break;
    }
 
-   setup->flush( setup, 0 );
+   sp_draw_flush( setup );
 }
 
 
@@ -202,111 +203,131 @@ sp_vbuf_draw_arrays(struct vbuf_render *vbr, uint start, uint nr)
    struct softpipe_vbuf_render *cvbr = softpipe_vbuf_render(vbr);
    struct softpipe_context *softpipe = cvbr->softpipe;
    struct draw_stage *setup = softpipe->setup;
-   struct prim_header prim;
    const void *vertex_buffer = cvbr->vertex_buffer;
    const unsigned vertex_size = softpipe->vertex_info_vbuf.size * sizeof(float);
    unsigned i;
-
-   prim.det = 0;
-   prim.reset_line_stipple = 0;
-   prim.edgeflags = 0;
-   prim.pad = 0;
+   struct setup_context *setup_ctx = sp_draw_setup_context(setup);
+   cptrf4 v[3];
 
 #define VERTEX(I) \
-   (struct vertex_header *) ((char *) vertex_buffer + (I) * vertex_size)
+   (cptrf4) ((char *) vertex_buffer + (I) * vertex_size)
 
    switch (cvbr->prim) {
    case PIPE_PRIM_POINTS:
       for (i = 0; i < nr; i++) {
-         prim.v[0] = VERTEX(i);
-         setup->point( setup, &prim );
+         v[0] = VERTEX(i);
+         setup_point( setup_ctx, v[0] );
       }
       break;
    case PIPE_PRIM_LINES:
       assert(nr % 2 == 0);
       for (i = 0; i < nr; i += 2) {
-         prim.v[0] = VERTEX(i);
-         prim.v[1] = VERTEX(i + 1);
-         setup->line( setup, &prim );
+         v[0] = VERTEX(i);
+         v[1] = VERTEX(i + 1);
+         setup_line( setup_ctx, v[0], v[1] );
       }
       break;
    case PIPE_PRIM_LINE_STRIP:
       for (i = 1; i < nr; i++) {
-         prim.v[0] = VERTEX(i - 1);
-         prim.v[1] = VERTEX(i);
-         setup->line( setup, &prim );
+         v[0] = VERTEX(i - 1);
+         v[1] = VERTEX(i);
+         setup_line( setup_ctx, v[0], v[1] );
       }
       break;
    case PIPE_PRIM_TRIANGLES:
       assert(nr % 3 == 0);
       for (i = 0; i < nr; i += 3) {
-         prim.v[0] = VERTEX(i + 0);
-         prim.v[1] = VERTEX(i + 1);
-         prim.v[2] = VERTEX(i + 2);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(i + 0);
+         v[1] = VERTEX(i + 1);
+         v[2] = VERTEX(i + 2);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    case PIPE_PRIM_TRIANGLE_STRIP:
       assert(nr >= 3);
       for (i = 2; i < nr; i++) {
-         prim.v[0] = VERTEX(i - 2);
-         prim.v[1] = VERTEX(i - 1);
-         prim.v[2] = VERTEX(i);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(i - 2);
+         v[1] = VERTEX(i - 1);
+         v[2] = VERTEX(i);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    case PIPE_PRIM_TRIANGLE_FAN:
       assert(nr >= 3);
       for (i = 2; i < nr; i++) {
-         prim.v[0] = VERTEX(0);
-         prim.v[1] = VERTEX(i - 1);
-         prim.v[2] = VERTEX(i);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(0);
+         v[1] = VERTEX(i - 1);
+         v[2] = VERTEX(i);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    case PIPE_PRIM_QUADS:
       assert(nr % 4 == 0);
       for (i = 0; i < nr; i += 4) {
-         prim.v[0] = VERTEX(i + 0);
-         prim.v[1] = VERTEX(i + 1);
-         prim.v[2] = VERTEX(i + 2);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
-
-         prim.v[0] = VERTEX(i + 0);
-         prim.v[1] = VERTEX(i + 2);
-         prim.v[2] = VERTEX(i + 3);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(i + 0);
+         v[1] = VERTEX(i + 1);
+         v[2] = VERTEX(i + 2);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
+
+         v[0] = VERTEX(i + 0);
+         v[1] = VERTEX(i + 2);
+         v[2] = VERTEX(i + 3);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    case PIPE_PRIM_QUAD_STRIP:
       assert(nr >= 4);
       for (i = 2; i < nr; i += 2) {
-         prim.v[0] = VERTEX(i - 2);
-         prim.v[1] = VERTEX(i);
-         prim.v[2] = VERTEX(i + 1);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
-
-         prim.v[0] = VERTEX(i - 2);
-         prim.v[1] = VERTEX(i + 1);
-         prim.v[2] = VERTEX(i - 1);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(i - 2);
+         v[1] = VERTEX(i);
+         v[2] = VERTEX(i + 1);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
+
+         v[0] = VERTEX(i - 2);
+         v[1] = VERTEX(i + 1);
+         v[2] = VERTEX(i - 1);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    case PIPE_PRIM_POLYGON:
       /* draw as tri fan */
       for (i = 2; i < nr; i++) {
-         prim.v[0] = VERTEX(0);
-         prim.v[1] = VERTEX(i - 1);
-         prim.v[2] = VERTEX(i);
-         calc_det(&prim);
-         setup->tri( setup, &prim );
+         v[0] = VERTEX(0);
+         v[1] = VERTEX(i - 1);
+         v[2] = VERTEX(i);
+         setup_tri( setup_ctx,
+                    calc_det(v[0], v[1], v[2]),
+                    v[0],
+                    v[1],
+                    v[2] );
       }
       break;
    default: