Mesa (master): mesa: fix glDeleteBuffers() regression

Brian Paul brianp at kemper.freedesktop.org
Thu Nov 11 14:32:41 PST 2010


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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Nov 11 15:31:28 2010 -0700

mesa: fix glDeleteBuffers() regression

This fixes a regression (failed assertion) from commit
c552f273f559968dfd770367e25329baccbcd0c4 which was hit if glDeleteBuffers()
was called on a buffer that was never bound.

NOTE: this is a candidate for the 7.9 branch.

---

 src/mesa/main/bufferobj.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index df44fbe..4d62f54 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -998,7 +998,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
          GLuint j;
 
-         ASSERT(bufObj->Name == ids[i]);
+         ASSERT(bufObj->Name == ids[i] || bufObj == &DummyBufferObject);
 
          if (_mesa_bufferobj_mapped(bufObj)) {
             /* if mapped, unmap it now */
@@ -1039,7 +1039,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          }
 
          /* The ID is immediately freed for re-use */
-         _mesa_HashRemove(ctx->Shared->BufferObjects, bufObj->Name);
+         _mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);
          _mesa_reference_buffer_object(ctx, &bufObj, NULL);
       }
    }



More information about the mesa-commit mailing list