From 45af29da8095af16729955117a165d23e77cd740 Mon Sep 17 00:00:00 2001 From: reduz Date: Thu, 19 May 2022 17:00:06 +0200 Subject: Add a new HashSet template * Intended to replace RBSet in most cases. * Optimized for iteration speed --- servers/rendering/shader_language.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'servers/rendering/shader_language.h') diff --git a/servers/rendering/shader_language.h b/servers/rendering/shader_language.h index d4a2e0b549..cd3f07e27e 100644 --- a/servers/rendering/shader_language.h +++ b/servers/rendering/shader_language.h @@ -589,7 +589,7 @@ public: bool is_const; int array_size; - HashMap> tex_argument_connect; + HashMap> tex_argument_connect; }; StringName name; @@ -622,7 +622,7 @@ public: struct Function { StringName name; FunctionNode *function = nullptr; - RBSet uses_function; + HashSet uses_function; bool callable; }; @@ -1068,10 +1068,10 @@ private: Node *_parse_and_reduce_expression(BlockNode *p_block, const FunctionInfo &p_function_info); Error _parse_block(BlockNode *p_block, const FunctionInfo &p_function_info, bool p_just_one = false, bool p_can_break = false, bool p_can_continue = false); - String _get_shader_type_list(const RBSet &p_shader_types) const; + String _get_shader_type_list(const HashSet &p_shader_types) const; String _get_qualifier_str(ArgumentQualifier p_qualifier) const; - Error _parse_shader(const HashMap &p_functions, const Vector &p_render_modes, const RBSet &p_shader_types); + Error _parse_shader(const HashMap &p_functions, const Vector &p_render_modes, const HashSet &p_shader_types); Error _find_last_flow_op_in_block(BlockNode *p_block, FlowOperation p_op); Error _find_last_flow_op_in_op(ControlFlowNode *p_flow, FlowOperation p_op); @@ -1097,7 +1097,7 @@ public: HashMap functions; Vector render_modes; VaryingFunctionNames varying_function_names = VaryingFunctionNames(); - RBSet shader_types; + HashSet shader_types; GlobalVariableGetTypeFunc global_variable_type_func = nullptr; }; -- cgit v1.2.3