summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-02-02 10:59:58 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2007-02-02 10:59:58 +0000
commit47d463e954efcd15d20ab2c96a455aa16ddffdcc (patch)
treebff61b207b243f70e6a64a299af11e28efbff34a
parent5368ae5ec329ddad5963d55b17cd4eccbc83d32f (diff)
Modify assert to reflect rebase criteria
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw_upload.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 803a524324..feb0901d12 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 brw_context *brw,
}
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);
}
}