diff options
| author | Bastiaan Olij <mux213@gmail.com> | 2021-03-11 13:24:23 +1100 |
|---|---|---|
| committer | Bastiaan Olij <mux213@gmail.com> | 2021-03-11 13:24:23 +1100 |
| commit | dfc41eb6f62a845d4f129b0571312349de8ec19d (patch) | |
| tree | e2830a143dc583146d081cdce8024bd38070559d | |
| parent | 01851defb5e43803bbcd6d8221a25ebbdd963119 (diff) | |
Moving RendererStorageRD *storage to protected, no sense duplicating it in forward_clustered
3 files changed, 1 insertions, 5 deletions
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp index 6ffecc9f35..df632a9e05 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp @@ -3333,7 +3333,6 @@ RendererSceneRenderForwardClustered::RendererSceneRenderForwardClustered(Rendere RendererSceneRenderRD(p_storage) { singleton = this; low_end = is_low_end(); - storage = p_storage; /* SCENE SHADER */ diff --git a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h index 96ab227c7c..a398e64f8c 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h +++ b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h @@ -83,8 +83,6 @@ class RendererSceneRenderForwardClustered : public RendererSceneRenderRD { ShaderCompilerRD compiler; } shader; - RendererStorageRD *storage; - /* Material */ struct ShaderData : public RendererStorageRD::ShaderData { diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/servers/rendering/renderer_rd/renderer_scene_render_rd.h index eefaf237a4..ed08a16311 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.h +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.h @@ -48,6 +48,7 @@ class RendererSceneRenderRD : public RendererSceneRender { friend RendererSceneGIRD; protected: + RendererStorageRD *storage; double time; double time_step = 0; @@ -111,8 +112,6 @@ private: RS::ViewportDebugDraw debug_draw = RS::VIEWPORT_DEBUG_DRAW_DISABLED; static RendererSceneRenderRD *singleton; - RendererStorageRD *storage; - /* REFLECTION ATLAS */ struct ReflectionAtlas { |