diff options
| -rw-r--r-- | src/mesa/main/api_validate.c | 7 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_array.c | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index ec3cc1b9853..ae3e118f426 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -25,6 +25,7 @@ #include <stdbool.h> #include "glheader.h" #include "api_validate.h" +#include "arrayobj.h" #include "bufferobj.h" #include "context.h" #include "imports.h" @@ -119,6 +120,12 @@ check_valid_to_render(struct gl_context *ctx, const char *function) unreachable("Invalid API value in check_valid_to_render()"); } + if (!_mesa_all_buffers_are_unmapped(ctx->Array.VAO)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(vertex buffers are mapped)", function); + return false; + } + return true; } diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index e1aa3ace32a..bfa9cd6447e 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -396,13 +396,7 @@ vbo_bind_arrays(struct gl_context *ctx) } } - if (!_mesa_all_buffers_are_unmapped(ctx->Array.VAO)) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "draw call (vertex buffers are mapped)"); - return false; - } else { - return true; - } + return true; } /** |