KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Add modes filter to nir_sort_variables 

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10989>
This commit is contained in:
Enrico Galli 2021-06-10 13:46:15 -07:00 committed by Marge Bot
parent 81cb20bd17
commit 8a5333c105
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/nir/nir.c
View File

@ -280,14 +280,20 @@ var_sort_cmp(const void *_a, const void *_b, void *_cmp)
}
void
nir_sort_variables(nir_shader *shader,
int (*cmp)(const nir_variable *, const nir_variable *))
nir_sort_variables_with_modes(nir_shader *shader,
int (*cmp)(const nir_variable *,
const nir_variable *),
nir_variable_mode modes)
{
const unsigned num_vars = exec_list_length(&shader->variables);
unsigned num_vars = 0;
nir_foreach_variable_with_modes(var, shader, modes) {
++num_vars;
}
struct var_cmp *vars = ralloc_array(shader, struct var_cmp, num_vars);
unsigned i = 0;
nir_foreach_variable_in_shader(var, shader) {
vars[i++] = (struct var_cmp) {
nir_foreach_variable_with_modes_safe(var, shader, modes) {
exec_node_remove(&var->node);
vars[i++] = (struct var_cmp){
.var = var,
.cmp = cmp,
};
@ -296,7 +302,6 @@ nir_sort_variables(nir_shader *shader,
util_qsort_r(vars, num_vars, sizeof(*vars), var_sort_cmp, cmp);
exec_list_make_empty(&shader->variables);
for (i = 0; i < num_vars; i++)
exec_list_push_tail(&shader->variables, &vars[i].var->node);

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

@ -3622,9 +3622,10 @@ nir_variable *nir_find_variable_with_driver_location(nir_shader *shader,
nir_variable_mode mode,
unsigned location);
void nir_sort_variables(nir_shader *shader,
int (*compar)(const nir_variable *,
const nir_variable *));
void nir_sort_variables_with_modes(nir_shader *shader,
int (*compar)(const nir_variable *,
const nir_variable *),
nir_variable_mode modes);
/** creates a function and adds it to the shader's list of functions */
nir_function *nir_function_create(nir_shader *shader, const char *name);