Module: Mesa
Branch: master
Commit: 41fbcc7901bc7a95fb7d5ccffdb3c18ba0361c40
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=41fbcc7901bc7a95fb7d5ccffdb3c18ba0361c40
Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
Date: Mon Apr 9 16:54:55 2018 +0200
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 <samuel.pitoi...@gmail.com>
---
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 cec62f6ac1..4e89969016 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 =
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
