diff options
author | Jason Ekstrand <[email protected]> | 2015-03-18 12:34:09 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2015-03-19 13:18:38 -0700 |
commit | 639115123efe7f71d432e24b1719adda7d23e97e (patch) | |
tree | c43e76da1b94e92fd3891f80710b65cb0ffa5b43 /src/glsl/nir/nir_print.c | |
parent | 8f255f948bd5c7b8fd56c8f72f6a9a7f626fca29 (diff) |
nir: Use a list instead of a hash_table for inputs, outputs, and uniforms
We never did a single hash table lookup in the entire NIR code base that I
found so there was no real benifit to doing it that way. I suppose that
for linking, we'll probably want to be able to lookup by name but we can
leave building that hash table to the linker. In the mean time this was
causing problems with GLSL IR -> NIR because GLSL IR doesn't guarantee us
unique names of uniforms, etc. This was causing massive rendering isues in
the unreal4 Sun Temple demo.
Reviewed-by: Connor Abbott <[email protected]>
Diffstat (limited to 'src/glsl/nir/nir_print.c')
-rw-r--r-- | src/glsl/nir/nir_print.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/glsl/nir/nir_print.c b/src/glsl/nir/nir_print.c index f8b14a149d3..fa11a312e51 100644 --- a/src/glsl/nir/nir_print.c +++ b/src/glsl/nir/nir_print.c @@ -844,18 +844,16 @@ nir_print_shader(nir_shader *shader, FILE *fp) print_var_state state; init_print_state(&state); - struct hash_entry *entry; - - hash_table_foreach(shader->uniforms, entry) { - print_var_decl((nir_variable *) entry->data, &state, fp); + foreach_list_typed(nir_variable, var, node, &shader->uniforms) { + print_var_decl(var, &state, fp); } - hash_table_foreach(shader->inputs, entry) { - print_var_decl((nir_variable *) entry->data, &state, fp); + foreach_list_typed(nir_variable, var, node, &shader->inputs) { + print_var_decl(var, &state, fp); } - hash_table_foreach(shader->outputs, entry) { - print_var_decl((nir_variable *) entry->data, &state, fp); + foreach_list_typed(nir_variable, var, node, &shader->outputs) { + print_var_decl(var, &state, fp); } foreach_list_typed(nir_variable, var, node, &shader->globals) { |