Merge pull request #60999 from reduz/replace-rbhash-by-hashmap

1 files changed, 18 insertions, 18 deletions

diff --git a/servers/rendering/shader_compiler.h b/servers/rendering/shader_compiler.h
index 347ecf2988..85b93c4063 100644
--- a/servers/rendering/shader_compiler.h
+++ b/servers/rendering/shader_compiler.h
@@ -45,14 +45,14 @@ public:
 	};
 
 	struct IdentifierActions {
-		Map<StringName, Stage> entry_point_stages;
+		HashMap<StringName, Stage> entry_point_stages;
 
-		Map<StringName, Pair<int *, int>> render_mode_values;
-		Map<StringName, bool *> render_mode_flags;
-		Map<StringName, bool *> usage_flag_pointers;
-		Map<StringName, bool *> write_flag_pointers;
+		HashMap<StringName, Pair<int *, int>> render_mode_values;
+		HashMap<StringName, bool *> render_mode_flags;
+		HashMap<StringName, bool *> usage_flag_pointers;
+		HashMap<StringName, bool *> write_flag_pointers;
 
-		Map<StringName, ShaderLanguage::ShaderNode::Uniform> *uniforms;
+		HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> *uniforms;
 	};
 
 	struct GeneratedCode {
@@ -74,7 +74,7 @@ public:
 		String uniforms;
 		String stage_globals[STAGE_MAX];
 
-		Map<String, String> code;
+		HashMap<String, String> code;
 
 		bool uses_global_textures;
 		bool uses_fragment_time;
@@ -82,10 +82,10 @@ public:
 	};
 
 	struct DefaultIdentifierActions {
-		Map<StringName, String> renames;
-		Map<StringName, String> render_mode_defines;
-		Map<StringName, String> usage_defines;
-		Map<StringName, String> custom_samplers;
+		HashMap<StringName, String> renames;
+		HashMap<StringName, String> render_mode_defines;
+		HashMap<StringName, String> usage_defines;
+		HashMap<StringName, String> custom_samplers;
 		ShaderLanguage::TextureFilter default_filter;
 		ShaderLanguage::TextureRepeat default_repeat;
 		String sampler_array_name;
@@ -103,20 +103,20 @@ private:
 
 	String _get_sampler_name(ShaderLanguage::TextureFilter p_filter, ShaderLanguage::TextureRepeat p_repeat);
 
-	void _dump_function_deps(const ShaderLanguage::ShaderNode *p_node, const StringName &p_for_func, const Map<StringName, String> &p_func_code, String &r_to_add, Set<StringName> &added);
+	void _dump_function_deps(const ShaderLanguage::ShaderNode *p_node, const StringName &p_for_func, const HashMap<StringName, String> &p_func_code, String &r_to_add, RBSet<StringName> &added);
 	String _dump_node_code(const ShaderLanguage::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions &p_actions, const DefaultIdentifierActions &p_default_actions, bool p_assigning, bool p_scope = true);
 
 	const ShaderLanguage::ShaderNode *shader = nullptr;
 	const ShaderLanguage::FunctionNode *function = nullptr;
 	StringName current_func_name;
 	StringName time_name;
-	Set<StringName> texture_functions;
+	RBSet<StringName> texture_functions;
 
-	Set<StringName> used_name_defines;
-	Set<StringName> used_flag_pointers;
-	Set<StringName> used_rmode_defines;
-	Set<StringName> internal_functions;
-	Set<StringName> fragment_varyings;
+	RBSet<StringName> used_name_defines;
+	RBSet<StringName> used_flag_pointers;
+	RBSet<StringName> used_rmode_defines;
+	RBSet<StringName> internal_functions;
+	RBSet<StringName> fragment_varyings;
 
 	DefaultIdentifierActions actions;