From c906723009cd5a5f199879aa9596c7ecc0fe75db Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 24 Aug 2023 08:13:26 +0200 Subject: [PATCH] radv: always declare some arguments for non-monolithic {VS,TES}/GS shaders When compiling VS/TES and GS separately, we can't know if the GS will need shader queries, so we have to always declare this argument. Similar story for the view index. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_shader_args.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c index 705a72fb16d..06017369d46 100644 --- a/src/amd/vulkan/radv_shader_args.c +++ b/src/amd/vulkan/radv_shader_args.c @@ -640,7 +640,7 @@ declare_shader_args(const struct radv_device *device, const struct radv_pipeline declare_global_input_sgprs(info, user_sgpr_info, args); - if (info->uses_view_index) { + if (!info->is_monolithic || info->uses_view_index) { add_ud_arg(args, 1, AC_ARG_INT, &args->ac.view_index, AC_UD_VIEW_INDEX); } @@ -655,7 +655,7 @@ declare_shader_args(const struct radv_device *device, const struct radv_pipeline add_ud_arg(args, 1, AC_ARG_INT, &args->ac.force_vrs_rates, AC_UD_FORCE_VRS_RATES); } - if (has_shader_query) + if (!info->is_monolithic || has_shader_query) add_ud_arg(args, 1, AC_ARG_INT, &args->shader_query_state, AC_UD_SHADER_QUERY_STATE); if (info->is_ngg) {