Mesa (7.10): draw: Fix an off-by-one bug in a vsplit assertion.

[Brian Paul]

Module: Mesa
Branch: 7.10
Commit: 0e809808b1084d2bdf89ad6210f0930362e0fbda
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e809808b1084d2bdf89ad6210f0930362e0fbda

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Jan 13 11:35:34 2011 -0700

draw: Fix an off-by-one bug in a vsplit assertion.

When use_spoken is true, istart (the first vertex of this segment) is
replaced by i0 (the spoken vertex of the fan).  There are still icount
vertices.

Thanks to Brian Paul for spotting this.
(cherry picked from commit abbb1c8f084c6739bc9d6f559caf26f3f71b2fab)

---

 src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
index 3f66f96..75dba8c 100644
--- a/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
+++ b/src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h
@@ -258,9 +258,10 @@ vsplit_segment_fan_linear(struct vsplit_frontend *vsplit, unsigned flags,
    boolean use_spoken = ((flags & DRAW_SPLIT_BEFORE) != 0);
    unsigned nr = 0, i;
 
-   assert(icount + !!use_spoken <= vsplit->segment_size);
+   assert(icount <= vsplit->segment_size);
 
    if (use_spoken) {
+      /* replace istart by i0 */
       vsplit->fetch_elts[nr++] = i0;
       for (i = 1 ; i < icount; i++)
          vsplit->fetch_elts[nr++] = istart + i;