From: Matt Turner <mattst88@gmail.com>
Date: Thu, 2 Mar 2017 19:14:36 +0000 (-0800)
Subject: nir: Return progress from nir_lower_clip_vs().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e4927cd9552b6fa40ef526029215a3d57dd6df9;p=mesa.git

nir: Return progress from nir_lower_clip_vs().

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index f4d706a49fb..8cd9d85996b 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -2497,7 +2497,7 @@ bool nir_lower_tex(nir_shader *shader,
 
 bool nir_lower_idiv(nir_shader *shader);
 
-void nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables);
+bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables);
 void nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables);
 bool nir_lower_clip_cull_distance_arrays(nir_shader *nir);
 
diff --git a/src/compiler/nir/nir_lower_clip.c b/src/compiler/nir/nir_lower_clip.c
index 8268e4128f6..227dcbb3f41 100644
--- a/src/compiler/nir/nir_lower_clip.c
+++ b/src/compiler/nir/nir_lower_clip.c
@@ -196,7 +196,7 @@ lower_clip_vs(nir_function_impl *impl, unsigned ucp_enables,
 /* ucp_enables is bitmask of enabled ucps.  Actual ucp values are
  * passed in to shader via user_clip_plane system-values
  */
-void
+bool
 nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
 {
    int clipvertex = -1;
@@ -206,7 +206,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
    nir_variable *out[2] = { NULL };
 
    if (!ucp_enables)
-      return;
+      return false;
 
    /* find clipvertex/position outputs: */
    nir_foreach_variable(var, &shader->outputs) {
@@ -231,7 +231,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
           * there should be no user-clip-planes to deal
           * with.
           */
-         return;
+         return false;
       }
    }
 
@@ -240,7 +240,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
    else if (position != -1)
       cv = find_output(shader, position);
    else
-      return;
+      return false;
 
    /* insert CLIPDIST outputs: */
    if (ucp_enables & 0x0f)
@@ -254,6 +254,8 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
       if (!strcmp(function->name, "main"))
          lower_clip_vs(function->impl, ucp_enables, cv, out);
    }
+
+   return true;
 }
 
 /*