From 5cd7324a57a0c6dc2ecffef236e6efd778cb78aa Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 22 Mar 2018 22:11:23 -0700 Subject: [PATCH] anv/pipeline: Do less deref instruction lowering This commit removes most of the deref instruction lowering. Instead of lowering early, we only lower textures and images and we only do so right before any of the anv image lowering passes. Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- src/intel/vulkan/anv_pipeline.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 16dcda9fc61..00bd49d7eb4 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -190,8 +190,6 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, assert(exec_list_length(&nir->functions) == 1); entry_point->name = ralloc_strdup(entry_point, "main"); - NIR_PASS_V(nir, nir_lower_deref_instrs, ~0); - /* Now that we've deleted all but the main function, we can go ahead and * lower the rest of the constant initializers. We do this here so that * nir_remove_dead_variables and split_per_member_structs below see the @@ -220,6 +218,9 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, nir = brw_preprocess_nir(compiler, nir); + NIR_PASS_V(nir, nir_lower_deref_instrs, + nir_lower_texture_derefs | nir_lower_image_derefs); + if (stage == MESA_SHADER_FRAGMENT) NIR_PASS_V(nir, anv_nir_lower_input_attachments); -- 2.30.2