register_var_use(nir_variable *var, nir_function_impl *impl,
struct hash_table *var_func_table)
{
- if (var->data.mode != nir_var_private)
+ if (var->data.mode != nir_var_shader_temp)
return;
struct hash_entry *entry =
* nir_function_impl that uses the given variable. If a variable is
* used in multiple functions, the data for the given key will be NULL.
*/
- struct hash_table *var_func_table =
- _mesa_hash_table_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
+ struct hash_table *var_func_table = _mesa_pointer_hash_table_create(NULL);
nir_foreach_function(function, shader) {
if (function->impl) {
}
}
- hash_table_foreach(var_func_table, entry) {
- nir_variable *var = (void *)entry->key;
- nir_function_impl *impl = entry->data;
+ nir_foreach_variable_with_modes_safe(var, shader, nir_var_shader_temp) {
+ struct hash_entry *entry = _mesa_hash_table_search(var_func_table, var);
+ if (!entry)
+ continue;
- assert(var->data.mode == nir_var_private);
+ nir_function_impl *impl = entry->data;
if (impl != NULL) {
exec_node_remove(&var->node);
- var->data.mode = nir_var_function;
+ var->data.mode = nir_var_function_temp;
exec_list_push_tail(&impl->locals, &var->node);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance |
if (progress)
nir_fixup_deref_modes(shader);
-#ifndef NDEBUG
nir_foreach_function(function, shader) {
- if (function->impl) {
- function->impl->valid_metadata &= ~nir_metadata_not_properly_reset;
- }
+ if (function->impl)
+ nir_metadata_preserve(function->impl, nir_metadata_all);
}
-#endif
return progress;
}