Mesa (master): mesa: Warn when indices are out of bounds, but do not skip the draw in debug builds.

Brian Paul brianp at kemper.freedesktop.org
Fri Jan 29 15:44:58 UTC 2010


Module: Mesa
Branch: master
Commit: 4886f677ecf121c863f8f65a846284ab9d26cbea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4886f677ecf121c863f8f65a846284ab9d26cbea

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 29 08:31:48 2010 -0700

mesa: Warn when indices are out of bounds, but do not skip the draw in debug builds.

The driver (or preferably the hardware) should handle out of bounds
indices.

If there are problems then it's better to detect those in the debug
builds.

(cherry picked from commit e3257912e006120f6ab611e77005eed1a464030a)

---

 src/mesa/vbo/vbo_exec_array.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index d6452cb..392da43 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -722,8 +722,7 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
 
 #ifdef DEBUG
       /* 'end' was out of bounds, but now let's check the actual array
-       * indexes to see if any of them are out of bounds.  If so, warn
-       * and skip the draw to avoid potential segfault, etc.
+       * indexes to see if any of them are out of bounds.
        */
       {
          GLuint max = _mesa_max_buffer_index(ctx, count, type, indices,
@@ -740,7 +739,6 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
                              ctx->Array.ElementArrayBufferObj->Name,
                              ctx->Array.ElementArrayBufferObj->Size);
             }
-            return;
          }
          /* XXX we could also find the min index and compare to 'start'
           * to see if start is correct.  But it's more likely to get the




More information about the mesa-commit mailing list