mesa: set bufObj->Pointer = NULL after unmapping
authorBrian Paul <brianp@vmware.com>
Fri, 27 Feb 2009 20:10:45 +0000 (13:10 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 27 Feb 2009 20:10:45 +0000 (13:10 -0700)
Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.

src/mesa/main/bufferobj.c

index 8df0a5b1a1e6d29158accafad6763de458e0108b..c8d160baa9a88c302bc1e094df5ac678df9bd272 100644 (file)
@@ -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;