From 5b5d4ea4a098c94442666402dccfc0a35333dced Mon Sep 17 00:00:00 2001 From: Thomas Helland Date: Tue, 16 Aug 2016 22:10:19 +0200 Subject: [PATCH] glsl: Convert function inlining to the util hash table Signed-off-by: Thomas Helland Reviewed-by: Timothy Arceri --- src/compiler/glsl/opt_function_inlining.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/glsl/opt_function_inlining.cpp b/src/compiler/glsl/opt_function_inlining.cpp index 19f5fae0a17..83534bfaf9e 100644 --- a/src/compiler/glsl/opt_function_inlining.cpp +++ b/src/compiler/glsl/opt_function_inlining.cpp @@ -32,7 +32,7 @@ #include "ir_function_inlining.h" #include "ir_expression_flattening.h" #include "compiler/glsl_types.h" -#include "program/hash_table.h" +#include "util/hash_table.h" static void do_variable_replacement(exec_list *instructions, @@ -104,7 +104,7 @@ ir_call::generate_inline(ir_instruction *next_ir) int i; struct hash_table *ht; - ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare); + ht = _mesa_hash_table_create(NULL, _mesa_hash_pointer, _mesa_key_pointer_equal); num_parameters = this->callee->parameters.length(); parameters = new ir_variable *[num_parameters]; @@ -207,7 +207,7 @@ ir_call::generate_inline(ir_instruction *next_ir) delete [] parameters; - hash_table_dtor(ht); + _mesa_hash_table_destroy(ht, NULL); } -- 2.30.2