From: Jason Ekstrand Date: Wed, 22 Mar 2017 22:24:06 +0000 (-0700) Subject: anv/pipeline: Call nir_gather_info later X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4549e05aa882f9f27dd9a5b8256af72a632b632;p=mesa.git anv/pipeline: Call nir_gather_info later We want to insert more lowering code that may insert system values and we need to gather info after that lowering. Reviewed-by: Iago Toral Quiroga --- diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 4bd4b4856cf..599286c2169 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -181,8 +181,6 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, if (stage == MESA_SHADER_FRAGMENT) NIR_PASS_V(nir, anv_nir_lower_input_attachments); - nir_shader_gather_info(nir, entry_point->impl); - return nir; } @@ -376,6 +374,8 @@ anv_pipeline_compile(struct anv_pipeline *pipeline, NIR_PASS_V(nir, anv_nir_lower_push_constants); + nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); + /* Figure out the number of parameters */ prog_data->nr_params = 0;