aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-18 07:21:08 +0000
committermarha <marha@users.sourceforge.net>2011-05-18 07:21:08 +0000
commit35484135119fcf55fe1cbb1fcdd0e035f581fcfb (patch)
tree0c735eaa913c0643b185b93d3758277ae1402553 /mesalib/src/gallium
parent08cbf3b50bfe713044f36b363c73768cd042f13c (diff)
downloadvcxsrv-35484135119fcf55fe1cbb1fcdd0e035f581fcfb.tar.gz
vcxsrv-35484135119fcf55fe1cbb1fcdd0e035f581fcfb.tar.bz2
vcxsrv-35484135119fcf55fe1cbb1fcdd0e035f581fcfb.zip
xkeyboard-config libX11 pixman mesa git update 18 May 2011
Diffstat (limited to 'mesalib/src/gallium')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
index a034483ee..04149525e 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -581,7 +581,12 @@ static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
* for that when dividing by stride. */
unused = vb->stride -
(mgr->ve->ve[i].src_offset + mgr->ve->src_format_size[i]);
- assert(unused >= 0);
+
+ /* If src_offset is greater than stride (which means it's a buffer
+ * offset rather than a vertex offset)... */
+ if (unused < 0) {
+ unused = 0;
+ }
/* Compute the maximum index for this vertex element. */
max_index =