vbo: simplify some code in check_draw_elements_data()
authorBrian Paul <brianp@vmware.com>
Fri, 7 Oct 2016 21:03:55 +0000 (15:03 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 13 Oct 2016 23:38:49 +0000 (17:38 -0600)
Use the 'vao' local var in more places.

Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
src/mesa/vbo/vbo_exec_array.c

index 1425e0bf2cc5987e35d0eeeab3504683f2ed346c..dc1ef7636266be6a0211c00ed85837914c49663d 100644 (file)
@@ -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++) {