vbo: Use _DrawVAO for array type draw commands.

Switch over to use the _DrawVAO for all the array type draws.
The _DrawVAO needs to be set before we enter _mesa_update_state, so move
setting the draw method in front of the first call to _mesa_update_state
which is in turn called from the *validate*Draw* calls. Using the
gl_vertex_array_object::_Enabled bitmask, gl_vertex_program_state::_VPMode
and gl_vertex_array_object::_AttributeMapMode we can already set
varying_vp_inputs before we call _mesa_update_state the first time.
Thus remove duplicate state validation.

v2: Update comments.

Signed-off-by: Mathias Fröhlich <[email protected]>
Reviewed-by: Brian Paul <[email protected]>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index 7b1ebc68f16..222bdcf1f27 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -206,11 +206,15 @@ vbo_exec_invalidate_state(struct gl_context *ctx)
    struct vbo_exec_context *exec = &vbo->exec;
 
    if (ctx->NewState & (_NEW_PROGRAM | _NEW_ARRAY)) {
-      if (!exec->validating)
-         exec->array.recalculate_inputs = GL_TRUE;
+      exec->array.recalculate_inputs = GL_TRUE;
 
       _ae_invalidate_state(ctx);
    }
+   /* If _mesa_update_state is called in a non draw code path,
+    * changes in the VAO need to be captured.
+    */
+   if (ctx->Array.VAO->NewArrays)
+      exec->array.recalculate_inputs = GL_TRUE;
 
    if (ctx->NewState & _NEW_EVAL)
       exec->eval.recalculate_maps = GL_TRUE;