diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-01 09:37:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-01 09:37:36 +0200 |
| commit | 121d6fdace941fa215cdf919d8e60310d0f38f2b (patch) | |
| tree | 07a3b43b7624e71c8f87506e0fafa74dfd5f4a1b /servers/rendering/renderer_rd/renderer_canvas_render_rd.h | |
| parent | de53e91b856aba0e0ac100707376c8de9f50b4d1 (diff) | |
| parent | 81c6f73109ca2a94e4b3b6738ee1cf0551303897 (diff) | |
| download | redot-engine-121d6fdace941fa215cdf919d8e60310d0f38f2b.tar.gz | |
Merge pull request #63754 from BastiaanOlij/storage_struct_private
Changed storage structs to private
Diffstat (limited to 'servers/rendering/renderer_rd/renderer_canvas_render_rd.h')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_canvas_render_rd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h index 1c0567b677..f96d4686ff 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.h +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.h @@ -149,7 +149,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender { ShaderCompiler compiler; } shader; - struct CanvasShaderData : public RendererRD::ShaderData { + struct CanvasShaderData : public RendererRD::MaterialStorage::ShaderData { enum BlendMode { //used internally BLEND_MODE_MIX, BLEND_MODE_ADD, @@ -193,12 +193,12 @@ class RendererCanvasRenderRD : public RendererCanvasRender { virtual ~CanvasShaderData(); }; - RendererRD::ShaderData *_create_shader_func(); - static RendererRD::ShaderData *_create_shader_funcs() { + RendererRD::MaterialStorage::ShaderData *_create_shader_func(); + static RendererRD::MaterialStorage::ShaderData *_create_shader_funcs() { return static_cast<RendererCanvasRenderRD *>(singleton)->_create_shader_func(); } - struct CanvasMaterialData : public RendererRD::MaterialData { + struct CanvasMaterialData : public RendererRD::MaterialStorage::MaterialData { CanvasShaderData *shader_data = nullptr; RID uniform_set; @@ -208,8 +208,8 @@ class RendererCanvasRenderRD : public RendererCanvasRender { virtual ~CanvasMaterialData(); }; - RendererRD::MaterialData *_create_material_func(CanvasShaderData *p_shader); - static RendererRD::MaterialData *_create_material_funcs(RendererRD::ShaderData *p_shader) { + RendererRD::MaterialStorage::MaterialData *_create_material_func(CanvasShaderData *p_shader); + static RendererRD::MaterialStorage::MaterialData *_create_material_funcs(RendererRD::MaterialStorage::ShaderData *p_shader) { return static_cast<RendererCanvasRenderRD *>(singleton)->_create_material_func(static_cast<CanvasShaderData *>(p_shader)); } |