From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Date: Thu, 26 Jan 2023 13:18:40 +0000 (+0900)
Subject: radv: Fix emitting tess indirect descriptors twice.
X-Git-Tag: upstream/23.3.3~13958
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b2fad04267d59c233f1114ffd0b2212abd24e87;p=platform%2Fupstream%2Fmesa.git

radv: Fix emitting tess indirect descriptors twice.

This fixes a copy-paste error found by manual inspection.

TES may be merged into GS with certain HW stage mappings, which lead to
duplicate set-register commands to be emitted with the old code.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20935>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 2730308..ba90306 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -4528,7 +4528,7 @@ radv_flush_indirect_descriptor_sets(struct radv_cmd_buffer *cmd_buffer,
          radv_emit_userdata_address(device, cs, pipeline, MESA_SHADER_TESS_CTRL,
                                     AC_UD_INDIRECT_DESCRIPTOR_SETS, va);
 
-      if (radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_TESS_CTRL))
+      if (radv_pipeline_has_stage(graphics_pipeline, MESA_SHADER_TESS_EVAL))
          radv_emit_userdata_address(device, cs, pipeline, MESA_SHADER_TESS_EVAL,
                                     AC_UD_INDIRECT_DESCRIPTOR_SETS, va);
    } else {