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

glsl/ir_constant_expression: don't ralloc the hash table

Browse Source 
Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36728>
This commit is contained in:
Marek Olšák
2025-08-11 01:47:37 -04:00
committed by Marge Bot
parent a1b645caec
commit 44d9d4d06b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/ir_constant_expression.cpp
+6 -5
View File
@@ -1203,7 +1203,8 @@ ir_function_signature::constant_expression_value(linear_ctx *linalloc,
* We expect the correctness of the number of parameters to have
* been checked earlier.
*/
hash_table *deref_hash = _mesa_pointer_hash_table_create(NULL);
hash_table deref_hash;
_mesa_pointer_hash_table_init(&deref_hash, NULL);
/* If "origin" is non-NULL, then the function body is there. So we
* have to use the variable objects from the object with the body,
@@ -1215,13 +1216,13 @@ ir_function_signature::constant_expression_value(linear_ctx *linalloc,
ir_constant *constant =
n->constant_expression_value(linalloc, variable_context);
if (constant == NULL) {
_mesa_hash_table_destroy(deref_hash, NULL);
_mesa_hash_table_fini(&deref_hash, NULL);
return NULL;
}
ir_variable *var = (ir_variable *)parameter_info;
_mesa_hash_table_insert(deref_hash, var, constant);
_mesa_hash_table_insert(&deref_hash, var, constant);
parameter_info = parameter_info->next;
}
@@ -1231,11 +1232,11 @@ ir_function_signature::constant_expression_value(linear_ctx *linalloc,
/* Now run the builtin function until something non-constant
* happens or we get the result.
*/
if (constant_expression_evaluate_expression_list(linalloc, origin ? origin->body : body, deref_hash, &result) &&
if (constant_expression_evaluate_expression_list(linalloc, origin ? origin->body : body, &deref_hash, &result) &&
result)
result = result->clone(linalloc, NULL);
_mesa_hash_table_destroy(deref_hash, NULL);
_mesa_hash_table_fini(&deref_hash, NULL);
return result;
}