From 41fbcc7901bc7a95fb7d5ccffdb3c18ba0361c40 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 9 Apr 2018 16:54:55 +0200 Subject: [PATCH] radv: Always reset draw user SGPRs after secondary command buffer. As we sometimes reset them to -1, -1 does not mean that they are not written by the secondary command buffer. Fixes: ad11fc3571 "radv: don't emit unneeded vertex state." Reviewed-by: Samuel Pitoiset --- src/amd/vulkan/radv_cmd_buffer.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index cec62f6ac11..4e89969016c 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2599,20 +2599,9 @@ void radv_CmdExecuteCommands( secondary->state.last_ia_multi_vgt_param; } - if (secondary->state.last_first_instance != -1) { - primary->state.last_first_instance = - secondary->state.last_first_instance; - } - - if (secondary->state.last_num_instances != -1) { - primary->state.last_num_instances = - secondary->state.last_num_instances; - } - - if (secondary->state.last_vertex_offset != -1) { - primary->state.last_vertex_offset = - secondary->state.last_vertex_offset; - } + primary->state.last_first_instance = secondary->state.last_first_instance; + primary->state.last_num_instances = secondary->state.last_num_instances; + primary->state.last_vertex_offset = secondary->state.last_vertex_offset; if (secondary->state.last_index_type != -1) { primary->state.last_index_type = -- 2.30.2