From eaacb278128ca64b170285feae58c89d16bff8a1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 15 Sep 2016 02:10:24 -0700 Subject: [PATCH] mesa: Move buffers-unmapped earlier in check_valid_to_render(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This needs to be above the switch on API, as that can return true (valid to render) before this error check even had a chance to run. Fixes ESEXT-CTS.draw_elements_base_vertex_tests.invalid_mapped_bos, which worked before commit 72f1566f90c434c7752d8405193eec68d6743246. Signed-off-by: Kenneth Graunke Reviewed-by: Mathias Fröhlich --- src/mesa/main/api_validate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index b35751e4668..6cb626a5805 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -45,6 +45,12 @@ check_valid_to_render(struct gl_context *ctx, const char *function) return false; } + if (!_mesa_all_buffers_are_unmapped(ctx->Array.VAO)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(vertex buffers are mapped)", function); + return false; + } + switch (ctx->API) { case API_OPENGLES2: /* For ES2, we can draw if we have a vertex program/shader). */ @@ -119,12 +125,6 @@ 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; } -- 2.30.2