From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 23 Jan 2019 10:44:28 +0000 (-0800)
Subject: st/nir: Call nir_lower_clip_cull_distance_arrays().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf731564e6d335c987c47d41817b75df8a637dde;p=mesa.git

st/nir: Call nir_lower_clip_cull_distance_arrays().

Today, st always sets LowerCombinedClipCullDistance, causing the GLSL IR
lowering to run, giving us vec4[2] arrays.  I would like to disable this
and instead run the NIR lowering so that we get compact float[] arrays
instead.

Calling the new pass is a noop if the GLSL IR pass has already run, so
it's safe to call the pass unconditionally.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index d87444aa70c..5fc87354624 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -742,6 +742,7 @@ st_link_nir(struct gl_context *ctx,
                  st->pipe->screen);
 
       NIR_PASS_V(nir, nir_lower_system_values);
+      NIR_PASS_V(nir, nir_lower_clip_cull_distance_arrays);
 
       nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
       shader->Program->info = nir->info;