diff options
| author | Matt Turner <[email protected]> | 2017-03-02 11:14:36 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2017-03-23 14:34:44 -0700 |
| commit | 4e4927cd9552b6fa40ef526029215a3d57dd6df9 (patch) | |
| tree | 7da908923dc697359e0a2119103f7b4e575a5438 /src/compiler | |
| parent | 6077cc75aa6d8460c6c79380800e9a4fd1072a5f (diff) | |
nir: Return progress from nir_lower_clip_vs().
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_clip.c | 10 |
2 files changed, 7 insertions, 5 deletions
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; } /* |