From 1630ec96d30ac5d8f47be78f2daa20d7d64add72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Thu, 15 Apr 2021 17:02:57 +0200 Subject: [PATCH] radv: Fill shader info earlier. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timur Kristóf Reviewed-by: Daniel Schürmann Part-of: --- src/amd/vulkan/radv_pipeline.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 80c9f06cc6d..29b815685e7 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -3351,6 +3351,9 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_device *device, gather_tess_info(device, nir, infos, pipeline_key); } + radv_fill_shader_keys(device, keys, pipeline_key, nir); + radv_fill_shader_info(pipeline, pStages, keys, infos, nir); + for (int i = 0; i < MESA_SHADER_STAGES; ++i) { if (nir[i]) { radv_start_feedback(stage_feedbacks[i]); @@ -3478,10 +3481,6 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_device *device, nir_print_shader(nir[i], stderr); } - radv_fill_shader_keys(device, keys, pipeline_key, nir); - - radv_fill_shader_info(pipeline, pStages, keys, infos, nir); - if ((nir[MESA_SHADER_VERTEX] && keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg) || (nir[MESA_SHADER_TESS_EVAL] && keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg)) { struct gfx10_ngg_info *ngg_info;