Mesa (master): mesa: set bufObj->Pointer = NULL after unmapping

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Feb 27 13:10:45 2009 -0700

mesa: set bufObj->Pointer = NULL after unmapping

Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.

---

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

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 8df0a5b..c8d160b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -796,6 +796,8 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
          if (bufObj->Pointer) {
             /* if mapped, unmap it now */
             ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+            bufObj->Access = DEFAULT_ACCESS;
+            bufObj->Pointer = NULL;
          }
 
          /* unbind any vertex pointers bound to this buffer */
@@ -1069,10 +1071,7 @@ _mesa_UnmapBufferARB(GLenum target)
       return GL_FALSE;
    }
 
-   if (ctx->Driver.UnmapBuffer) {
-      status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
-   }
-
+   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    bufObj->Access = DEFAULT_ACCESS;
    bufObj->Pointer = NULL;