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_cull_distance_arrays().

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Matt Turner
2017-02-24 15:38:28 -08:00
parent 19345fc160
commit 5a7e4ae23d
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2499,7 +2499,7 @@ bool nir_lower_idiv(nir_shader *shader);
void 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_cull_distance_arrays(nir_shader *nir);
bool nir_lower_clip_cull_distance_arrays(nir_shader *nir);
void nir_lower_two_sided_color(nir_shader *shader);

24
src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
View File

@@ -121,13 +121,14 @@ rewrite_references(nir_instr *instr,
/* There's no need to update writemasks; it's a scalar array. */
}
static void
static bool
combine_clip_cull(nir_shader *nir,
struct exec_list *vars,
bool store_info)
{
nir_variable *cull = NULL;
nir_variable *clip = NULL;
bool progress = false;
nir_foreach_variable(var, vars) {
if (var->data.location == VARYING_SLOT_CLIP_DIST0)
@@ -174,15 +175,30 @@ combine_clip_cull(nir_shader *nir,
exec_node_remove(&cull->node);
ralloc_free(cull);
}
nir_foreach_function(function, nir) {
if (function->impl) {
nir_metadata_preserve(function->impl,
nir_metadata_block_index |
nir_metadata_dominance);
}
}
progress = true;
}
return progress;
}
void
bool
nir_lower_clip_cull_distance_arrays(nir_shader *nir)
{
bool progress = false;
if (nir->stage <= MESA_SHADER_GEOMETRY)
combine_clip_cull(nir, &nir->outputs, true);
progress |= combine_clip_cull(nir, &nir->outputs, true);
if (nir->stage > MESA_SHADER_VERTEX)
combine_clip_cull(nir, &nir->inputs, false);
progress |= combine_clip_cull(nir, &nir->inputs, false);
return progress;
}