Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/pipe/Makefile

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mesa/pipe/softpipe/sp_prim_vbuf.c b/src/mesa/pipe/softpipe/sp_prim_vbuf.c
index 2cfdeb5809..055cb19f9a 100644
--- a/src/mesa/pipe/softpipe/sp_prim_vbuf.c
+++ b/src/mesa/pipe/softpipe/sp_prim_vbuf.c
@@ -120,6 +120,12 @@ static void emit_vertex( struct vbuf_stage *vbuf,
    vertex->vertex_id = vbuf->nr_vertices++;
 
    //vbuf->emit_vertex( vbuf->vertex_ptr, vertex );
+
+   /* Note: for softpipe, the vertex includes the vertex header info
+    * such as clip flags and clip coords.  In the future when vbuf is
+    * always used, we could just copy the vertex attributes/data here.
+    * The sp_prim_setup.c code doesn't use any of the vertex header info.
+    */
    memcpy(vbuf->vertex_ptr, vertex, vbuf->vertex_size);
 
    vbuf->vertex_ptr += vbuf->vertex_size;
@@ -221,7 +227,9 @@ static void vbuf_flush_elements( struct draw_stage *stage )
    struct vbuf_stage *vbuf = vbuf_stage( stage );
 
    if (vbuf->nr_elements) {
+      /*
       fprintf(stderr, "%s (%d elts)\n", __FUNCTION__, vbuf->nr_elements);
+      */
 
       /* Draw now or add to list of primitives???
        */