diff options
author | Brian Paul <[email protected]> | 2009-08-31 08:59:38 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2009-08-31 09:01:58 -0600 |
commit | 822c7964819ca1fcc270880d4ca8b3de8a4276d0 (patch) | |
tree | 67b3d95ffab71f687967508cf679719554e0a4b2 /src/mesa/main/bufferobj.c | |
parent | 28c159d61461dab0963860725b77fc56566838fa (diff) |
mesa: additional assertions for ctx->Driver.UnmapBuffer()
The Pointer, Offset and Lenght fields should be cleared by the driver function
since ctx->Driver.Unmap() may be called from VBO code, etc.
Diffstat (limited to 'src/mesa/main/bufferobj.c')
-rw-r--r-- | src/mesa/main/bufferobj.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 715a6e650b2..3fd1d17ff9b 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -484,6 +484,9 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target, (void) target; /* XXX we might assert here that bufObj->Pointer is non-null */ bufObj->Pointer = NULL; + bufObj->Length = 0; + bufObj->Offset = 0; + bufObj->AccessFlags = 0x0; return GL_TRUE; } @@ -1095,7 +1098,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, /* Unmap the existing buffer. We'll replace it now. Not an error. */ ctx->Driver.UnmapBuffer(ctx, target, bufObj); bufObj->AccessFlags = DEFAULT_ACCESS; - bufObj->Pointer = NULL; + ASSERT(bufObj->Pointer == NULL); } FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT); @@ -1304,9 +1307,9 @@ _mesa_UnmapBufferARB(GLenum target) status = ctx->Driver.UnmapBuffer( ctx, target, bufObj ); bufObj->AccessFlags = DEFAULT_ACCESS; - bufObj->Pointer = NULL; - bufObj->Offset = 0; - bufObj->Length = 0; + ASSERT(bufObj->Pointer == NULL); + ASSERT(bufObj->Offset == 0); + ASSERT(bufObj->Length == 0); return status; } |