In draw_flatshade.c use vertex_info->interp_mode[] to choose attribs/colors to cpy.

One less dependency on the TGSI_ATTRIB_x flags.
This requires setting the vertex_info->interp_mode[] values in the i915 driver and passing them to draw_set_vertex_attributes().

1 files changed, 3 insertions, 1 deletions

diff --git a/src/mesa/pipe/softpipe/sp_state_derived.c b/src/mesa/pipe/softpipe/sp_state_derived.c
index 3bbe9c9fd9d..ff0a275fcea 100644
--- a/src/mesa/pipe/softpipe/sp_state_derived.c
+++ b/src/mesa/pipe/softpipe/sp_state_derived.c
@@ -135,11 +135,13 @@ static void calculate_vertex_layout( struct softpipe_context *softpipe )
    /* If the attributes have changed, tell the draw module about
     * the new vertex layout.
     */
-   if (vinfo->attr_mask != softpipe->attr_mask) {
+   /* XXX we also need to do this when the shading mode (interp modes) change: */
+   if (1/*vinfo->attr_mask != softpipe->attr_mask*/) {
       softpipe->attr_mask = vinfo->attr_mask;
 
       draw_set_vertex_attributes( softpipe->draw,
                                   vinfo->slot_to_attrib,
+                                  vinfo->interp_mode,
                                   vinfo->num_attribs);
    }
 }