From: Dave Airlie <airlied@redhat.com>
Date: Wed, 9 May 2018 03:21:43 +0000 (+1000)
Subject: nir: fix clip cull lowering to not assert if GLSL already lowered.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ff281e62043203fd83f3f88e2ed68828646e155d;p=mesa.git

nir: fix clip cull lowering to not assert if GLSL already lowered.

If GLSL has already done the lowering, we'd rather not crash in this pass.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
index 86ce5fb1f86..2afbf9285c0 100644
--- a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
+++ b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
@@ -144,6 +144,12 @@ combine_clip_cull(nir_shader *nir,
          cull = var;
    }
 
+   /* if the GLSL lowering pass has already run, don't bother repeating */
+   if (!cull && clip) {
+      if (!glsl_type_is_array(clip->type))
+         return false;
+   }
+
    const unsigned clip_array_size = get_unwrapped_array_length(nir, clip);
    const unsigned cull_array_size = get_unwrapped_array_length(nir, cull);