OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Return progress from nir_lower_clip_vs().

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Matt Turner
2017-03-02 11:14:36 -08:00
parent 6077cc75aa
commit 4e4927cd95
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir.h
View File

@@ -2497,7 +2497,7 @@ bool nir_lower_tex(nir_shader *shader,
bool nir_lower_idiv(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); void nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables);
bool nir_lower_clip_cull_distance_arrays(nir_shader *nir); bool nir_lower_clip_cull_distance_arrays(nir_shader *nir);

10
src/compiler/nir/nir_lower_clip.c
View File

@@ -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 /* ucp_enables is bitmask of enabled ucps. Actual ucp values are
* passed in to shader via user_clip_plane system-values * passed in to shader via user_clip_plane system-values
*/ */
void bool
nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables) nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
{ {
int clipvertex = -1; int clipvertex = -1;
@@ -206,7 +206,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
nir_variable *out[2] = { NULL }; nir_variable *out[2] = { NULL };
if (!ucp_enables) if (!ucp_enables)
return; return false;
/* find clipvertex/position outputs: */ /* find clipvertex/position outputs: */
nir_foreach_variable(var, &shader->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 * there should be no user-clip-planes to deal
* with. * with.
*/ */
return; return false;
} }
} }
@@ -240,7 +240,7 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
else if (position != -1) else if (position != -1)
cv = find_output(shader, position); cv = find_output(shader, position);
else else
return; return false;
/* insert CLIPDIST outputs: */ /* insert CLIPDIST outputs: */
if (ucp_enables & 0x0f) if (ucp_enables & 0x0f)
@@ -254,6 +254,8 @@ nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables)
if (!strcmp(function->name, "main")) if (!strcmp(function->name, "main"))
lower_clip_vs(function->impl, ucp_enables, cv, out); lower_clip_vs(function->impl, ucp_enables, cv, out);
} }
return true;
} }
/* /*