[Mesa-dev] [PATCH 4/4] vbo: Eliminate short-circuiting in invalid-start case.

Kenneth Graunke kenneth at whitecape.org
Thu Feb 16 11:14:08 PST 2012


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 at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
 src/mesa/vbo/vbo_exec_array.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 809804f..06e36a6 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.
-- 
1.7.7.6



More information about the mesa-dev mailing list