From 2b27dcd0751e704193ceb0572447799342dd1db5 Mon Sep 17 00:00:00 2001 From: Bruce Cherniak Date: Tue, 27 Jun 2017 17:49:06 -0500 Subject: [PATCH] swr: conditionally validate vertex buffer state Vertex buffer state doesn't need to be validated on every call, only on dirty _NEW_VERTEX or indexed draws. Unconditional validation was introduced as part of patch 330d0607ed6, "remove pipe_index_buffer and set_index_buffer", with the expectation we'd optimize later. Reviewed-by: Tim Rowley --- src/gallium/drivers/swr/swr_state.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp index f65e6427534..6dc06ed1563 100644 --- a/src/gallium/drivers/swr/swr_state.cpp +++ b/src/gallium/drivers/swr/swr_state.cpp @@ -1212,12 +1212,13 @@ swr_update_derived(struct pipe_context *pipe, SwrSetViewports(ctx->swrContext, 1, vp, vpm); } - /* Set vertex & index buffers */ - /* (using draw info if called by swr_draw_vbo) */ - /* TODO: This is always true, because the index buffer comes from + /* Set vertex & index buffers + * (using draw info if called by swr_draw_vbo) + * If indexed draw, revalidate since index buffer comes from * pipe_draw_info. */ - if (1 || ctx->dirty & SWR_NEW_VERTEX) { + if (ctx->dirty & SWR_NEW_VERTEX || + (p_draw_info && p_draw_info->index_size)) { uint32_t scratch_total; uint8_t *scratch = NULL; -- 2.30.2