KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@web.de>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Mathias Fröhlich 2016-08-14 14:03:58 +02:00
parent 5c1ccd8053
commit c17cf1c8f5
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/vbo/vbo_exec_array.c
View File

@ -76,22 +76,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.
@ -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;