mesa: Branch 'vbo-0.2' - 2 commits

[Keith Whitwell]

 src/mesa/drivers/dri/i965/brw_draw_upload.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

New commits:
diff-tree 2ddc8799a8e243cb10cd69ea9424f72b6c4de534 (from parents)
Merge: 47d463e954efcd15d20ab2c96a455aa16ddffdcc 8ebda479d90b0c95df50f790316f451a32f4bd4e
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Fri Feb 2 11:06:37 2007 +0000

    Merge branch 'vbo-0.2-origin' into vbo-0.2

diff-tree 47d463e954efcd15d20ab2c96a455aa16ddffdcc (from 5368ae5ec329ddad5963d55b17cd4eccbc83d32f)
Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Fri Feb 2 10:59:58 2007 +0000

    Modify assert to reflect rebase criteria

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 803a524..feb0901 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -439,7 +439,15 @@ GLboolean brw_upload_vertices( struct br
 	 }
 
 	 upload[nr_uploads++] = input;
-	 assert(min_index == 0);
+	 
+	 /* We rebase drawing to start at element zero only when
+	  * varyings are not in vbos, which means we can end up
+	  * uploading non-varying arrays (stride != 0) when min_index
+	  * is zero.  This doesn't matter as the amount to upload is
+	  * the same for these arrays whether the draw call is rebased
+	  * or not - we just have to upload the one element.
+	  */
+	 assert(min_index == 0 || input->glarray->StrideB == 0);
       }
    }