From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 8 Feb 2012 13:08:24 +0000 (-0800)
Subject: vbo: Eliminate short-circuiting in invalid-start case.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e738d35c5c88769ececbadd5f4ac14d36647168;p=mesa.git

vbo: Eliminate short-circuiting in invalid-start case.

Now that we have a index_range_invalid flag, we can just use that rather
than calling vbo_validated_drawrangeelements directly and returning.

NOTE: This is a candidate for release branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 809804f3b1c..06e36a677eb 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -889,11 +889,7 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
                        start, end, basevertex, count, type, indices,
                        ctx->Array.ArrayObj->_MaxElement - 1);
       }
-
-      /* Just do an ordinary glDrawElementsBaseVertex(). */
-      vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, 0, ~0,
-                                      count, type, indices, basevertex, 1);
-      return;
+      index_bounds_valid = GL_FALSE;
    }
 
    /* NOTE: It's important that 'end' is a reasonable value.