[Mesa-dev] [PATCH 06/13] anv/pipeline: Move gather_info further down the compilation process

[Jason Ekstrand]

The lower_input_attachments pass that we're about to add will generate
additional uses of system values and we want those to be reflected in
gather_info.
---
 src/intel/vulkan/anv_pipeline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index bdac404..c251463 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -166,8 +166,6 @@ anv_shader_compile_to_nir(struct anv_device *device,
 
    nir = brw_preprocess_nir(compiler, nir);
 
-   nir_shader_gather_info(nir, entry_point->impl);
-
    nir_variable_mode indirect_mask = 0;
    if (compiler->glsl_compiler_options[stage].EmitNoIndirectInput)
       indirect_mask |= nir_var_shader_in;
@@ -369,6 +367,8 @@ anv_pipeline_compile(struct anv_pipeline *pipeline,
     */
    nir->num_uniforms = prog_data->nr_params * 4;
 
+   nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
+
    return nir;
 }
 
-- 
2.5.0.400.gff86faf