radv: Fix single stage constant flush with merged shaders.

e.g. a VERTEX only flush with tess on Vega should look at the TCS
to see which bits are needed.

CC: <mesa-stable@lists.freedesktop.org>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1953
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 1e5e28341358eec900d5c65a9f8698ccfd542aec..01a0787dcf5bcd7fe7b992c49334adc0569b96ef 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2313,14 +2313,15 @@ radv_flush_constants(struct radv_cmd_buffer *cmd_buffer,
                return;
 
        radv_foreach_stage(stage, stages) {
-               if (!pipeline->shaders[stage])
+               shader = radv_get_shader(pipeline, stage);
+               if (!shader)
                        continue;
 
-               need_push_constants |= pipeline->shaders[stage]->info.loads_push_constants;
-               need_push_constants |= pipeline->shaders[stage]->info.loads_dynamic_offsets;
+               need_push_constants |= shader->info.loads_push_constants;
+               need_push_constants |= shader->info.loads_dynamic_offsets;
 
-               uint8_t base = pipeline->shaders[stage]->info.base_inline_push_consts;
-               uint8_t count = pipeline->shaders[stage]->info.num_inline_push_consts;
+               uint8_t base = shader->info.base_inline_push_consts;
+               uint8_t count = shader->info.num_inline_push_consts;
 
                radv_emit_inline_push_consts(cmd_buffer, pipeline, stage,
                                             AC_UD_INLINE_PUSH_CONSTANTS,