From d3c604e12e1e2ef1e562f51e529ba18bae2d9af1 Mon Sep 17 00:00:00 2001 From: Mathias Fröhlich Date: Fri, 16 Mar 2018 06:34:35 +0100 Subject: mesa: Update VAO internal state when setting the _DrawVAO. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the VAO internal state on Array._DrawVAO instead of Array.VAO. Also the VAO internal state update gets triggered now by a change of Array._DrawVAO instead of the _NEW_ARRAY state flag. Also no driver looks at any VAO's NewArrays value from within the Driver.UpdateState callback. So it should be safe to move this update into the _mesa_set_draw_vao method. Reviewed-by: Brian Paul Signed-off-by: Mathias Fröhlich --- src/mesa/vbo/vbo_exec_draw.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/mesa/vbo/vbo_exec_draw.c') diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 1ed9d5eac0c..3490dbe44da 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -231,9 +231,6 @@ vbo_exec_bind_arrays(struct gl_context *ctx) assert(!_mesa_is_bufferobj(exec->vtx.bufferobj) || (vao_enabled & ~vao->VertexAttribBufferMask) == 0); - _mesa_update_vao_derived_arrays(ctx, vao); - vao->NewArrays = 0; - _mesa_set_draw_vao(ctx, vao, _vbo_get_vao_filter(mode)); /* The exec VAO is not immutable, so we need to set manually */ ctx->NewDriverState |= ctx->DriverFlags.NewArray; -- cgit v1.2.3