From: Brian Paul <brianp@vmware.com>
Date: Mon, 19 Apr 2010 16:27:55 +0000 (-0600)
Subject: mesa: unmap the immediate mode VB before destroying it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96b0807253a491442e336844f997fdc4e1761303;p=mesa.git

mesa: unmap the immediate mode VB before destroying it

Fixes failed assertion from fd.o bug 27713.

The assertion was added with the new resource/transfer changes.
This patch could apply to the 7.8 branch but it's not essential.
---

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index e83bd9e4045..0ccbb423831 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -850,8 +850,11 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
                                     NULL);
    }
 
-   /* Free the vertex buffer:
+   /* Free the vertex buffer.  Unmap first if needed.
     */
+   if (_mesa_bufferobj_mapped(exec->vtx.bufferobj)) {
+      ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER, exec->vtx.bufferobj);
+   }
    _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL);
 }