From: Chia-I Wu <olv@lunarg.com>
Date: Fri, 6 Aug 2010 16:50:32 +0000 (+0800)
Subject: draw: Add an assertion to varray's version of trim().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e34c52da87990b1ec64602a20418cdb274deefa9;p=mesa.git

draw: Add an assertion to varray's version of trim().

Assert that "first" is always smaller than "count" and add reasoning.
It would be better to simply fix trim(), but it is used in tight loops
right now.
---

diff --git a/src/gallium/auxiliary/draw/draw_pt_varray_tmp_linear.h b/src/gallium/auxiliary/draw/draw_pt_varray_tmp_linear.h
index a292346be95..55e43b2a714 100644
--- a/src/gallium/auxiliary/draw/draw_pt_varray_tmp_linear.h
+++ b/src/gallium/auxiliary/draw/draw_pt_varray_tmp_linear.h
@@ -1,6 +1,11 @@
 static unsigned trim( unsigned count, unsigned first, unsigned incr )
 {
-   return count - (count - first) % incr; 
+   /*
+    * count either has been trimmed in draw_pt_arrays or is set to
+    * (driver)_fetch_max which is hopefully always larger than first.
+    */
+   assert(count >= first);
+   return count - (count - first) % incr;
 }
 
 static void FUNC(struct draw_pt_front_end *frontend,