From: Jason Ekstrand Date: Mon, 2 Oct 2017 16:53:50 +0000 (-0700) Subject: anv/pipeline: Call nir_lower_system_valaues after brw_preprocess_nir X-Git-Tag: upstream/18.1.0~4788 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=279f8fb69cf68d05287e14f60cf67fc025643bc4;p=platform%2Fupstream%2Fmesa.git anv/pipeline: Call nir_lower_system_valaues after brw_preprocess_nir We currently have a bug where nir_lower_system_values gets called before nir_lower_var_copies so it will miss any system value uses which come from a copy_var intrinsic. Moving it to after brw_preprocess_nir fixes this problem. Reviewed-by: Lionel Landwerlin Cc: mesa-stable@lists.freedesktop.org --- diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 726dfcf..9863ec3 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -188,13 +188,14 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, NIR_PASS_V(nir, nir_propagate_invariant); NIR_PASS_V(nir, nir_lower_io_to_temporaries, entry_point->impl, true, false); - NIR_PASS_V(nir, nir_lower_system_values); /* Vulkan uses the separate-shader linking model */ nir->info.separate_shader = true; nir = brw_preprocess_nir(compiler, nir); + NIR_PASS_V(nir, nir_lower_system_values); + if (stage == MESA_SHADER_FRAGMENT) NIR_PASS_V(nir, anv_nir_lower_input_attachments);