diff options
| author | Mathias Fröhlich <[email protected]> | 2018-03-16 06:34:35 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2018-03-22 04:58:52 +0100 |
| commit | d3c604e12e1e2ef1e562f51e529ba18bae2d9af1 (patch) | |
| tree | d78452e323095b1f2054a5cad37fc8e9634a9ded /src/mesa/vbo | |
| parent | c4c56ff303e39f55e7940b33e8afeafa80b26280 (diff) | |
mesa: Update VAO internal state when setting the _DrawVAO.
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 <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/vbo')
| -rw-r--r-- | src/mesa/vbo/vbo_exec_draw.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; |