Mesa (master): vbo: Array draw must not care about glBegin/ glEnd vbo mapping.

[Mathias Fröhlich]

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

Author: Mathias Fröhlich <mathias.froehlich at web.de>
Date:   Sun Aug 14 14:03:58 2016 +0200

vbo: Array draw must not care about glBegin/glEnd vbo mapping.

In array draw do not check if the vertex buffer object that
is used to implement immediate mode glBegin/glEnd is mapped.

Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/vbo/vbo_exec_array.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index f371890..8789837 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -77,22 +77,6 @@ check_input_buffers_are_unmapped(const struct gl_vertex_array_object *vao)
 
 
 /**
- * A debug function that may be called from other parts of Mesa as
- * needed during debugging.
- */
-static bool
-check_buffers_are_unmapped(struct gl_context *ctx)
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-
-   /* check the current vertex arrays */
-   return !_mesa_check_disallowed_mapping(exec->vtx.bufferobj) &&
-      check_input_buffers_are_unmapped(ctx->Array.VAO);
-}
-
-
-/**
  * Check that element 'j' of the array has reasonable data.
  * Map VBO if needed.
  * For debugging purposes; not normally used.
@@ -446,7 +430,7 @@ vbo_bind_arrays(struct gl_context *ctx)
       }
    }
 
-   if (!check_buffers_are_unmapped(ctx)) {
+   if (!check_input_buffers_are_unmapped(ctx->Array.VAO)) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "draw call (vertex buffers are mapped)");
       return false;