Mesa (master): i965: Fix extending VB packets

[Chris Wilson]

Module: Mesa
Branch: master
Commit: 9d31138f53c0bee9193af73850ab6febddd29f51
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d31138f53c0bee9193af73850ab6febddd29f51

Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Mar  3 22:34:22 2011 +0000

i965: Fix extending VB packets

Computation of the delta of this array from the last had a silly little
bug and ignored any initial delta==0 causing grief in Nexuiz and
friends.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

---

 src/mesa/drivers/dri/i965/brw_draw_upload.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 4478ef9..e96c32a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -484,7 +484,7 @@ static void brw_prepare_vertices(struct brw_context *brw)
    }
 
    /* can we simply extend the current vb? */
-   if (0 && j == brw->vb.nr_current_buffers) {
+   if (j == brw->vb.nr_current_buffers) {
       int delta = 0;
       for (i = 0; i < j; i++) {
 	 int d;
@@ -494,7 +494,7 @@ static void brw_prepare_vertices(struct brw_context *brw)
 	    break;
 
 	 d = brw->vb.buffers[i].offset - brw->vb.current_buffers[i].offset;
-	 if (delta == 0)
+	 if (i == 0)
 	    delta = d / brw->vb.current_buffers[i].stride;
 	 if (delta * brw->vb.current_buffers[i].stride != d)
 	    break;