From 0de9265b1f10a791044342a05829b72f0cc133dc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 7 Oct 2016 15:03:55 -0600 Subject: [PATCH] vbo: simplify some code in check_draw_elements_data() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use the 'vao' local var in more places. Reviewed-by: Mathias Fröhlich --- src/mesa/vbo/vbo_exec_array.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 1425e0bf2cc..dc1ef763626 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -128,11 +128,11 @@ check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType, GLint i; GLuint k; - if (_mesa_is_bufferobj(ctx->Array.VAO->IndexBufferObj)) { + if (_mesa_is_bufferobj(vao->IndexBufferObj)) { elemMap = ctx->Driver.MapBufferRange(ctx, 0, - ctx->Array.VAO->IndexBufferObj->Size, + vao->IndexBufferObj->Size, GL_MAP_READ_BIT, - ctx->Array.VAO->IndexBufferObj, + vao->IndexBufferObj, MAP_INTERNAL); elements = ADD_POINTERS(elements, elemMap); } @@ -162,8 +162,7 @@ check_draw_elements_data(struct gl_context *ctx, GLsizei count, GLenum elemType, } if (_mesa_is_bufferobj(vao->IndexBufferObj)) { - ctx->Driver.UnmapBuffer(ctx, ctx->Array.VAO->IndexBufferObj, - MAP_INTERNAL); + ctx->Driver.UnmapBuffer(ctx, vao->IndexBufferObj, MAP_INTERNAL); } for (k = 0; k < VERT_ATTRIB_MAX; k++) { -- 2.30.2