gallium: added new EMIT_HEADER token

Used to emit the struct vertex_header info for softpipe.
Before we were using the EMIT_ALL token but that's insufficient for the
draw pass-through mode.  EMIT_ALL might get removed soon...

diff --git a/src/gallium/auxiliary/draw/draw_vertex.c b/src/gallium/auxiliary/draw/draw_vertex.c
index daf1ef4..970adc9 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vertex.c
+++ b/src/gallium/auxiliary/draw/draw_vertex.c
@@ -52,6 +52,9 @@ draw_compute_vertex_size(struct vertex_info *vinfo)
       switch (vinfo->emit[i]) {
       case EMIT_OMIT:
          break;
+      case EMIT_HEADER:
+         vinfo->size += sizeof(struct vertex_header) / 4;
+         break;
       case EMIT_4UB:
          /* fall-through */
       case EMIT_1F_PSIZE:

diff --git a/src/gallium/auxiliary/draw/draw_vertex.h b/src/gallium/auxiliary/draw/draw_vertex.h
index 267c742..abd2017 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vertex.h
+++ b/src/gallium/auxiliary/draw/draw_vertex.h
@@ -48,6 +48,7 @@
 enum attrib_emit {
    EMIT_OMIT,      /**< don't emit the attribute */
    EMIT_ALL,       /**< emit whole post-xform vertex, w/ header */
+   EMIT_HEADER,    /**< emit vertex_header struct (XXX temp?) */
    EMIT_1F,
    EMIT_1F_PSIZE,  /**< insert constant point size */
    EMIT_2F,