From a1b645caec4bd450db1005217ef6d1567f729ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 11 Aug 2025 01:39:20 -0400 Subject: [PATCH] glsl/opt_function_inlining: don't ralloc the hash table Reviewed-by: Gert Wollny Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/glsl/opt_function_inlining.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp index 733d39940c6..7fb78ee7c4d 100644 --- a/src/compiler/glsl/opt_function_inlining.cpp +++ b/src/compiler/glsl/opt_function_inlining.cpp @@ -139,9 +139,9 @@ ir_call::generate_inline(ir_instruction *next_ir) ir_variable **parameters; unsigned num_parameters; int i; - struct hash_table *ht; + struct hash_table ht; - ht = _mesa_pointer_hash_table_create(NULL); + _mesa_pointer_hash_table_init(&ht, NULL); num_parameters = this->callee->parameters.length(); parameters = new ir_variable *[num_parameters]; @@ -161,7 +161,7 @@ ir_call::generate_inline(ir_instruction *next_ir) /* Actual replacement happens below */ parameters[i] = NULL; } else { - parameters[i] = sig_param->clone(linalloc, ht); + parameters[i] = sig_param->clone(linalloc, &ht); parameters[i]->data.mode = ir_var_temporary; /* Remove the read-only decoration because we're going to write @@ -226,7 +226,7 @@ ir_call::generate_inline(ir_instruction *next_ir) /* Generate the inlined body of the function to a new list */ ir_foreach_in_list(ir_instruction, ir, &callee->body) { - ir_instruction *new_ir = ir->clone(linalloc, ht); + ir_instruction *new_ir = ir->clone(linalloc, &ht); new_instructions.push_tail(new_ir); visit_tree(new_ir, replace_return_with_assignment, this->return_deref); @@ -273,7 +273,7 @@ ir_call::generate_inline(ir_instruction *next_ir) delete [] parameters; - _mesa_hash_table_destroy(ht, NULL); + _mesa_hash_table_fini(&ht, NULL); } /**