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/renderer_canvas_render_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/renderer_canvas_render_rd.h')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_canvas_render_rd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h index 06970acca6..04881ce7e6 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h @@ -166,14 +166,14 @@ class RendererCanvasRenderRD : public RendererCanvasRender { PipelineVariants pipeline_variants; String path; - Map<StringName, ShaderLanguage::ShaderNode::Uniform> uniforms; + HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> uniforms; Vector<ShaderCompiler::GeneratedCode::Texture> texture_uniforms; Vector<uint32_t> ubo_offsets; uint32_t ubo_size = 0; String code; - Map<StringName, Map<int, RID>> default_texture_params; + HashMap<StringName, HashMap<int, RID>> default_texture_params; bool uses_screen_texture = false; bool uses_sdf = false; @@ -205,7 +205,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender { virtual void set_render_priority(int p_priority) {} virtual void set_next_pass(RID p_pass) {} - virtual bool update_parameters(const Map<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty); + virtual bool update_parameters(const HashMap<StringName, Variant> &p_parameters, bool p_uniform_dirty, bool p_textures_dirty); virtual ~CanvasMaterialData(); }; |