diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-16 11:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 11:59:38 +0200 |
| commit | c1277c2183eaacb9ae49f9fef0c57443b934b72b (patch) | |
| tree | 434b526eb286850ebccc6d2c998a7d90fdb8b5e2 /servers/rendering/renderer_rd/shader_rd.h | |
| parent | 396def9b66c476f7834604adb7136ca903ed01be (diff) | |
| parent | 746dddc0673d7261f19b1e056e90e6e3a49ef33a (diff) | |
Merge pull request #60999 from reduz/replace-rbhash-by-hashmap
Diffstat (limited to 'servers/rendering/renderer_rd/shader_rd.h')
| -rw-r--r-- | servers/rendering/renderer_rd/shader_rd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/rendering/renderer_rd/shader_rd.h b/servers/rendering/renderer_rd/shader_rd.h index 8e57f0d9af..40b10808c2 100644 --- a/servers/rendering/renderer_rd/shader_rd.h +++ b/servers/rendering/renderer_rd/shader_rd.h @@ -35,7 +35,7 @@ #include "core/string/string_builder.h" #include "core/templates/hash_map.h" #include "core/templates/local_vector.h" -#include "core/templates/map.h" +#include "core/templates/rb_map.h" #include "core/templates/rid_owner.h" #include "core/variant/variant.h" #include "servers/rendering_server.h" @@ -51,7 +51,7 @@ class ShaderRD { CharString vertex_globals; CharString compute_globals; CharString fragment_globals; - Map<StringName, CharString> code_sections; + HashMap<StringName, CharString> code_sections; Vector<CharString> custom_defines; Vector<uint8_t> *variant_data = nullptr; @@ -129,8 +129,8 @@ protected: public: RID version_create(); - void version_set_code(RID p_version, const Map<String, String> &p_code, const String &p_uniforms, const String &p_vertex_globals, const String &p_fragment_globals, const Vector<String> &p_custom_defines); - void version_set_compute_code(RID p_version, const Map<String, String> &p_code, const String &p_uniforms, const String &p_compute_globals, const Vector<String> &p_custom_defines); + void version_set_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_vertex_globals, const String &p_fragment_globals, const Vector<String> &p_custom_defines); + void version_set_compute_code(RID p_version, const HashMap<String, String> &p_code, const String &p_uniforms, const String &p_compute_globals, const Vector<String> &p_custom_defines); _FORCE_INLINE_ RID version_get_shader(RID p_version, int p_variant) { ERR_FAIL_INDEX_V(p_variant, variant_defines.size(), RID()); |