5 files changed, 31 insertions, 43 deletions

diff --git a/src/mesa/pipe/draw/draw_vertex.c b/src/mesa/pipe/draw/draw_vertex.c
index 983ed71ec0f..89f54ff1869 100644
--- a/src/mesa/pipe/draw/draw_vertex.c
+++ b/src/mesa/pipe/draw/draw_vertex.c
@@ -87,37 +87,34 @@ draw_compute_vertex_size(struct vertex_info *vinfo)
 
 
 /**
- * Tell the drawing module about the layout of post-transformation vertices
+ * Tell the drawing module about the contents of post-transformation vertices.
+ * Note that the vertex attribute format info isn't used by 'draw'; all
+ * attributes are handled as float[4].  But when the driver emits vertices
+ * it'll use that info.
+ * We _do_ care about the number of attributes and their interpolation modes.
  */
 void
-draw_set_vertex_attributes( struct draw_context *draw,
-                            const uint *slot_to_vf_attr,
-                            const enum interp_mode *interps,
-                            unsigned nr_attrs )
+draw_set_vertex_info( struct draw_context *draw,
+                      const struct vertex_info *info)
 {
-   struct vertex_info *vinfo = &draw->vertex_info;
-   unsigned i;
+   assert(info->interp_mode[0] == INTERP_LINEAR); /* should be vert pos */
 
-   assert(interps[0] == INTERP_LINEAR); /* should be vert pos */
-
-   assert(nr_attrs <= PIPE_MAX_SHADER_OUTPUTS);
+   assert(info->num_attribs <= PIPE_MAX_SHADER_OUTPUTS);
 
    /* Note that draw-module vertices will consist of the attributes passed
     * to this function, plus a header/prefix containing the vertex header
     * flags and GLfloat[4] clip pos.
     */
 
-   memset(vinfo, 0, sizeof(*vinfo));
-
-   /* copy attrib info */
-   for (i = 0; i < nr_attrs; i++) {
-      emit_vertex_attr(vinfo, FORMAT_4F, interps[i]);
-   }
+   memcpy(&draw->vertex_info, info, sizeof(*info));
 
-   draw_compute_vertex_size(vinfo);
+   draw_compute_vertex_size(&draw->vertex_info);
 
-   /* add extra words for vertex header (uint), clip pos (float[4]) */
-   vinfo->size += 5;
+   /* Need to know vertex size (in words) for vertex copying elsewhere.
+    * Four words per attribute, plus vertex header (uint) and clip
+    * position (float[4]).
+    */
+   draw->vertex_info.size = draw->vertex_info.num_attribs * 4 + 5;
 }
 
 
diff --git a/src/mesa/pipe/draw/draw_vertex.h b/src/mesa/pipe/draw/draw_vertex.h
index d9b5e7c8c0f..8bb328affa3 100644
--- a/src/mesa/pipe/draw/draw_vertex.h
+++ b/src/mesa/pipe/draw/draw_vertex.h
@@ -92,10 +92,8 @@ draw_emit_vertex_attr(struct vertex_info *vinfo,
 }
 
 
-extern void draw_set_vertex_attributes( struct draw_context *draw,
-                                        const uint *attrs,
-                                        const enum interp_mode *interps,
-                                        unsigned nr_attrs );
+extern void draw_set_vertex_info( struct draw_context *draw,
+                                  const struct vertex_info *info);
 
 extern void draw_set_twoside_attributes(struct draw_context *draw,
                                         uint front0, uint back0,
diff --git a/src/mesa/pipe/i915simple/i915_state_derived.c b/src/mesa/pipe/i915simple/i915_state_derived.c
index ed1521fcce2..688c0c5798b 100644
--- a/src/mesa/pipe/i915simple/i915_state_derived.c
+++ b/src/mesa/pipe/i915simple/i915_state_derived.c
@@ -132,11 +132,8 @@ static void calculate_vertex_layout( struct i915_context *i915 )
       /* If the attributes have changed, tell the draw module about the new
        * vertex layout.  We'll also update the hardware vertex format info.
        */
-      draw_set_vertex_attributes( i915->draw,
-                                  NULL,/*vinfo.slot_to_attrib,*/
-                                  vinfo.interp_mode,
-                                  vinfo.num_attribs);
-      
+      draw_set_vertex_info( i915->draw, &vinfo);
+
       draw_set_twoside_attributes(i915->draw,
                                   front0, back0, front1, back1);
 
diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 81f70f0f244..7e5efbfde39 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -156,10 +156,7 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
    if (1/*vinfo->attr_mask != softpipe->attr_mask*/) {
       /*softpipe->attr_mask = vinfo->attr_mask;*/
 
-      draw_set_vertex_attributes( softpipe->draw,
-                                  NULL,/*vinfo->slot_to_attrib,*/
-                                  vinfo->interp_mode,
-                                  vinfo->num_attribs);
+      draw_set_vertex_info( softpipe->draw, vinfo);
 
       draw_set_twoside_attributes(softpipe->draw,
                                   front0, back0, front1, back1);
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 3b6d8291452..61ff034550d 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -324,27 +324,26 @@ static void
 set_feedback_vertex_format(GLcontext *ctx)
 {
    struct st_context *st = ctx->st;
-   uint attrs[PIPE_MAX_SHADER_OUTPUTS];
-   enum interp_mode interp[PIPE_MAX_SHADER_OUTPUTS];
-   GLuint n, i;
+   struct vertex_info vinfo;
+   GLuint i;
 
    if (ctx->RenderMode == GL_SELECT) {
       assert(ctx->RenderMode == GL_SELECT);
-      n = 1;
-      attrs[0] = FORMAT_4F;
-      interp[0] = INTERP_NONE;
+      vinfo.num_attribs = 1;
+      vinfo.format[0] = FORMAT_4F;
+      vinfo.interp_mode[0] = INTERP_NONE;
    }
    else {
       /* GL_FEEDBACK, or glRasterPos */
       /* emit all attribs (pos, color, texcoord) as GLfloat[4] */
-      n = st->state.vs->state.num_outputs;
-      for (i = 0; i < n; i++) {
-         attrs[i] = FORMAT_4F;
-         interp[i] = INTERP_NONE;
+      vinfo.num_attribs = st->state.vs->state.num_outputs;
+      for (i = 0; i < vinfo.num_attribs; i++) {
+         vinfo.format[i] = FORMAT_4F;
+         vinfo.interp_mode[i] = INTERP_LINEAR;
       }
    }
 
-   draw_set_vertex_attributes(st->draw, attrs, interp, n);
+   draw_set_vertex_info(st->draw, &vinfo);
 }