From: Eric Anholt <eric@anholt.net>
Date: Tue, 8 Oct 2013 00:31:04 +0000 (-0700)
Subject: i965: Be sure to reset brw->vb.buffers[] when trying to redo vertex setup.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b58e0ed642b1833b86dbefb36b6055a6709a720;p=mesa.git

i965: Be sure to reset brw->vb.buffers[] when trying to redo vertex setup.

The brw_prepare_vertices that sets up buffers[] depends on these
parameters, so don't let brw_prepare_vertices() skip it.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 549f9d0a598..b6cfd53712c 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -398,10 +398,12 @@ static bool brw_try_draw_prims( struct gl_context *ctx,
       if (brw->num_instances != prims[i].num_instances) {
          brw->num_instances = prims[i].num_instances;
          brw->state.dirty.brw |= BRW_NEW_VERTICES;
+         brw_merge_inputs(brw, arrays);
       }
       if (brw->basevertex != prims[i].basevertex) {
          brw->basevertex = prims[i].basevertex;
          brw->state.dirty.brw |= BRW_NEW_VERTICES;
+         brw_merge_inputs(brw, arrays);
       }
       if (brw->gen < 6)
 	 brw_set_prim(brw, &prims[i]);