From f7cbeb0d1b4a2b7aca6a5995e98855f043f0e6e6 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Thu, 11 Mar 2021 18:08:10 +1100 Subject: [PATCH] Removed time duplicate from ForwardClustered. Just use the variable from its superclass --- .../renderer_rd/renderer_scene_render_forward_clustered.cpp | 5 ----- .../renderer_rd/renderer_scene_render_forward_clustered.h | 3 --- servers/rendering/renderer_rd/renderer_scene_render_rd.h | 2 +- 3 files changed, 1 insertion(+), 9 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 c8e8521fdea..7a19495f489 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp +++ b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp @@ -2805,11 +2805,6 @@ RID RendererSceneRenderForwardClustered::_render_buffers_get_normal_texture(RID RendererSceneRenderForwardClustered *RendererSceneRenderForwardClustered::singleton = nullptr; -void RendererSceneRenderForwardClustered::set_time(double p_time, double p_step) { - time = p_time; - RendererSceneRenderRD::set_time(p_time, p_step); -} - void RendererSceneRenderForwardClustered::_geometry_instance_mark_dirty(GeometryInstance *p_geometry_instance) { GeometryInstanceForwardClustered *ginstance = static_cast(p_geometry_instance); if (ginstance->dirty_list_element.in_list()) { 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 eb44b1afcfc..98e2a7efccb 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h +++ b/servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h @@ -490,7 +490,6 @@ class RendererSceneRenderForwardClustered : public RendererSceneRenderRD { static RendererSceneRenderForwardClustered *singleton; - double time; RID default_shader; RID default_material; RID overdraw_material_shader; @@ -759,8 +758,6 @@ public: virtual void geometry_instance_pair_decal_instances(GeometryInstance *p_geometry_instance, const RID *p_decal_instances, uint32_t p_decal_instance_count); virtual void geometry_instance_pair_gi_probe_instances(GeometryInstance *p_geometry_instance, const RID *p_gi_probe_instances, uint32_t p_gi_probe_instance_count); - virtual void set_time(double p_time, double p_step); - virtual bool free(RID p_rid); RendererSceneRenderForwardClustered(RendererStorageRD *p_storage); diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/servers/rendering/renderer_rd/renderer_scene_render_rd.h index ed08a16311a..001cfeb74d8 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.h +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.h @@ -1182,7 +1182,7 @@ public: return debug_draw; } - virtual void set_time(double p_time, double p_step); + void set_time(double p_time, double p_step); RID get_reflection_probe_buffer(); RID get_omni_light_buffer();