From: Samuel Pitoiset Date: Thu, 19 Oct 2017 10:35:46 +0000 (+0200) Subject: radv: re-emit VGT_INDEX_TYPE because non-indexed draws overwrite it X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54fa635f82478a63908dbaf206465a347616fed0;p=mesa.git radv: re-emit VGT_INDEX_TYPE because non-indexed draws overwrite it Only on CIK and later. We should only update VGT_INDEX_TYPE but it seems easier to re-emit all the index buffer packets. Fixes: 966d66f28f (radv: do not re-emit the index buffer for every draw call) Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 9500e3ccb97..1b6cea95dc7 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1812,8 +1812,17 @@ radv_cmd_buffer_flush_state(struct radv_cmd_buffer *cmd_buffer, if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_FRAMEBUFFER) radv_emit_framebuffer_state(cmd_buffer); - if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_INDEX_BUFFER) - radv_emit_index_buffer(cmd_buffer); + if (indexed_draw) { + if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_INDEX_BUFFER) + radv_emit_index_buffer(cmd_buffer); + } else { + /* On CI and later, non-indexed draws overwrite VGT_INDEX_TYPE, + * so the state must be re-emitted before the next indexed + * draw. + */ + if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) + cmd_buffer->state.dirty |= RADV_CMD_DIRTY_INDEX_BUFFER; + } ia_multi_vgt_param = si_get_ia_multi_vgt_param(cmd_buffer, instanced_draw, indirect_draw, draw_vertex_count); if (cmd_buffer->state.last_ia_multi_vgt_param != ia_multi_vgt_param) {