Feature cleanup memory leaks

src/d3d12/d3d12_render_target.cpp

@@ -247,16 +247,9 @@ namespace wr::d3d12
 
 	void Resize(RenderTarget** render_target, Device* device, unsigned int width, unsigned int height)
 	{
-		(*render_target)->m_width = width;
-		(*render_target)->m_height = height;
-
-		if ((*render_target)->m_create_info.m_dsv_format == Format::D32_FLOAT && (*render_target)->m_create_info.m_create_dsv_buffer)
-		{
-			DestroyDepthStencilBuffer((*render_target));
-		}
-		DestroyRenderTargetViews((*render_target));
-
-		(*render_target) = CreateRenderTarget(device, width, height, (*render_target)->m_create_info);
+		auto create_info = (*render_target)->m_create_info;
+		Destroy(*render_target);
+		(*render_target) = CreateRenderTarget(device, width, height, create_info);
 	}
 
 	void IncrementFrameIdx(RenderTarget* render_target)

src/frame_graph/frame_graph.hpp

@@ -334,9 +334,9 @@ namespace wr
 			}
 
 			// Make sure we free the data objects we allocated.
-			for (auto& data : m_data)
+			for (void *data : m_data)
 			{
-				delete data;
+				free(data);
 			}
 
 			for (auto& cmd_list : m_cmd_lists)
@@ -643,7 +643,11 @@ namespace wr
 			m_settings.resize(m_num_tasks + 1ull);
 			m_types.emplace_back(desc.m_type);
 			m_rt_properties.emplace_back(desc.m_properties);
-			m_data.emplace_back(new (std::nothrow) T());
+
+			void *data = malloc(sizeof(T));
+			m_data.emplace_back(data);
+			::new (data) T();		//TODO: This destructor can't be called, because of how it is stored in m_data
+
 			m_data_type_info.emplace_back(typeid(T));
 
 			// If we are allowed to do multithreading place the task in the appropriate vector

src/render_tasks/d3d12_accumulation.hpp

@@ -95,12 +95,13 @@ namespace wr
 				1);
 		}
 
-		inline void DestroyAccumulation(FrameGraph& fg, RenderTaskHandle handle, bool)
+		inline void DestroyAccumulation(FrameGraph& fg, RenderTaskHandle handle, bool resize)
 		{
-			auto& data = fg.GetData<AccumulationData>(handle);
-
-			// Small hack to force the allocations to go out of scope, which will tell the texture pool to free them
-			DescriptorAllocation temp = std::move(data.out_allocation);
+			if(!resize)
+			{
+				auto& data = fg.GetData<AccumulationData>(handle);
+				data.~AccumulationData();
+			}
 		}
 
 	} /* internal */

src/render_tasks/d3d12_bloom_composition.hpp

@@ -169,10 +169,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<BloomCompostionData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~BloomCompostionData();
 			}
 		}
 

src/render_tasks/d3d12_bloom_extract_bright.hpp

@@ -146,10 +146,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<BloomExtractBrightData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~BloomExtractBrightData();
 			}
 		}
 

src/render_tasks/d3d12_bloom_horizontal_blur.hpp

@@ -155,10 +155,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<BloomBlurHorizontalData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~BloomBlurHorizontalData();
 			}
 		}
 

src/render_tasks/d3d12_bloom_vertical_blur.hpp

@@ -164,10 +164,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<BloomBlurVerticalData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~BloomBlurVerticalData();
 			}
 		}
 

src/render_tasks/d3d12_build_acceleration_structures.hpp

@@ -517,11 +517,7 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<ASBuildData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_scene_ib_alloc);
-				DescriptorAllocation temp2 = std::move(data.out_scene_mat_alloc);
-				DescriptorAllocation temp3 = std::move(data.out_scene_offset_alloc);
+				data.~ASBuildData();
 			}
 		}
 

src/render_tasks/d3d12_cubemap_convolution.hpp

@@ -226,7 +226,11 @@ namespace wr
 		desc.m_execute_func = [](RenderSystem& rs, FrameGraph& fg, SceneGraph& sg, RenderTaskHandle handle) {
 			internal::ExecuteCubemapConvolutionTask(rs, fg, sg, handle);
 		};
-		desc.m_destroy_func = [](FrameGraph&, RenderTaskHandle, bool) {
+		desc.m_destroy_func = [](FrameGraph& fg, RenderTaskHandle handle, bool resize) {
+			if(!resize)
+			{
+				fg.GetData<CubemapConvolutionTaskData>(handle).~CubemapConvolutionTaskData();
+			}
 		};
 
 		desc.m_properties = rt_properties;

src/render_tasks/d3d12_deferred_composition.cpp

@@ -359,18 +359,7 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DeferredCompositionTaskData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the texture pool to free them
-				std::move(data.out_gbuffer_albedo_alloc);
-				std::move(data.out_gbuffer_normal_alloc);
-				std::move(data.out_gbuffer_emissive_alloc);
-				std::move(data.out_gbuffer_depth_alloc);
-				std::move(data.out_lights_alloc);
-				std::move(data.out_buffer_refl_alloc);
-				std::move(data.out_buffer_shadow_alloc);
-				std::move(data.out_screen_space_irradiance_alloc);
-				std::move(data.out_screen_space_ao_alloc);
-				std::move(data.out_output_alloc);
+				data.~DeferredCompositionTaskData();
 			}
 		}
 

src/render_tasks/d3d12_dof_bokeh.hpp

@@ -187,11 +187,9 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFBokehData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				data.camera_cb_pool->Destroy(data.cb_handle);
 				delete data.out_allocator;
+				data.~DoFBokehData();
 			}
 		}
 

src/render_tasks/d3d12_dof_bokeh_postfilter.hpp

@@ -137,10 +137,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFBokehPostFilterData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DoFBokehPostFilterData();
 			}
 		}
 

src/render_tasks/d3d12_dof_coc.hpp

@@ -138,11 +138,9 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFCoCData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				data.camera_cb_pool->Destroy(data.cb_handle);
 				delete data.out_allocator;
+				data.~DoFCoCData();
 			}
 		}
 

src/render_tasks/d3d12_dof_composition.hpp

@@ -164,10 +164,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFCompositionData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DoFCompositionData();
 			}
 		}
 

src/render_tasks/d3d12_dof_dilate_flatten.hpp

@@ -107,10 +107,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFDilateFlattenData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DoFDilateFlattenData();
 			}
 		}
 	} /* internal */

src/render_tasks/d3d12_dof_dilate_flatten_second_pass.hpp

@@ -107,10 +107,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFDilateFlattenHData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DoFDilateFlattenHData();
 			}
 		}
 

src/render_tasks/d3d12_dof_dilate_near.hpp

@@ -106,10 +106,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DoFDilateData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DoFDilateData();
 			}
 		}
 

src/render_tasks/d3d12_down_scale.hpp

@@ -144,10 +144,8 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<DownScaleData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_allocation);
 				delete data.out_allocator;
+				data.~DownScaleData();
 			}
 		}
 

src/render_tasks/d3d12_equirect_to_cubemap.hpp

@@ -306,7 +306,11 @@ namespace wr
 		desc.m_execute_func = [](RenderSystem& rs, FrameGraph& fg, SceneGraph& sg, RenderTaskHandle handle) {
 			internal::ExecuteEquirectToCubemapTask(rs, fg, sg, handle);
 		};
-		desc.m_destroy_func = [](FrameGraph&, RenderTaskHandle, bool) {
+		desc.m_destroy_func = [](FrameGraph& fg, RenderTaskHandle handle, bool resize) {
+			if(!resize)
+			{
+				fg.GetData<EquirectToCubemapTaskData>(handle).~EquirectToCubemapTaskData();
+			}
 		};
 
 		desc.m_properties = rt_properties;

src/render_tasks/d3d12_hbao.hpp

@@ -39,11 +39,11 @@ namespace wr
 		GFSDK_SSAO_InputData_D3D12 ssao_input_data;
 #endif
 
-		d3d12::DescHeapCPUHandle cpu_depth_handle = d3d12::DescHeapCPUHandle();
-		d3d12::DescHeapGPUHandle gpu_depth_handle = d3d12::DescHeapGPUHandle();
-		d3d12::DescHeapCPUHandle cpu_normal_handle = d3d12::DescHeapCPUHandle();
-		d3d12::DescHeapGPUHandle gpu_normal_handle = d3d12::DescHeapGPUHandle();
-		d3d12::DescHeapCPUHandle cpu_target_handle = d3d12::DescHeapCPUHandle();
+		d3d12::DescHeapCPUHandle cpu_depth_handle{};
+		d3d12::DescHeapGPUHandle gpu_depth_handle{};
+		d3d12::DescHeapCPUHandle cpu_normal_handle{};
+		d3d12::DescHeapGPUHandle gpu_normal_handle{};
+		d3d12::DescHeapCPUHandle cpu_target_handle{};
 	};
 
 	namespace internal
@@ -189,6 +189,7 @@ namespace wr
 			d3d12::Destroy(data.out_descriptor_heap_rtv);
 
 			delete data.ssao_context;
+			data.~HBAOData();
 #endif
 		}
 

src/render_tasks/d3d12_path_tracer.hpp

@@ -408,12 +408,7 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<PathTracerData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				std::move(data.out_output_alloc);
-				std::move(data.out_gbuffer_albedo_alloc);
-				std::move(data.out_gbuffer_normal_alloc);
-				std::move(data.out_gbuffer_depth_alloc);
+				data.~PathTracerData();
 			}
 		}
 

src/render_tasks/d3d12_post_processing.hpp

@@ -106,12 +106,13 @@ namespace wr
 				1);
 		}
 
-		inline void DestroyPostProcessing(FrameGraph& fg, RenderTaskHandle handle, bool)
+		inline void DestroyPostProcessing(FrameGraph& fg, RenderTaskHandle handle, bool resize)
 		{
-			auto& data = fg.GetData<PostProcessingData>(handle);
-
-			// Small hack to force the allocations to go out of scope, which will tell the texture pool to free them
-			DescriptorAllocation temp = std::move(data.out_allocation);
+			if (!resize)
+			{
+				auto &data = fg.GetData<PostProcessingData>(handle);
+				data.~PostProcessingData();
+			}
 		}
 
 	} /* internal */

src/render_tasks/d3d12_raytracing_task.hpp

@@ -337,9 +337,7 @@ namespace wr
 			if (!resize)
 			{
 				auto& data = fg.GetData<RaytracingData>(handle);
-
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_uav_from_rtv);
+				data.~RaytracingData();
 			}
 		}
 

src/render_tasks/d3d12_rt_reflection_task.hpp

@@ -268,15 +268,10 @@ namespace wr
 
 		inline void DestroyRTReflectionTask(FrameGraph& fg, RenderTaskHandle handle, bool resize)
 		{
-			auto& data = fg.GetData<RTReflectionData>(handle);
-
 			if (!resize)
 			{
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				std::move(data.base_data.out_output_alloc);
-				std::move(data.base_data.out_gbuffer_albedo_alloc);
-				std::move(data.base_data.out_gbuffer_normal_alloc);
-				std::move(data.base_data.out_gbuffer_depth_alloc);
+				auto& data = fg.GetData<RTReflectionData>(handle);
+				data.~RTReflectionData();
 			}
 		}
 

src/render_tasks/d3d12_rt_shadow_task.hpp

@@ -285,15 +285,10 @@ namespace wr
 
 		inline void DestroyRTShadowTask(FrameGraph& fg, RenderTaskHandle handle, bool resize)
 		{
-			auto& data = fg.GetData<RTShadowData>(handle);
-
 			if (!resize)
 			{
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				std::move(data.base_data.out_output_alloc);
-				std::move(data.base_data.out_gbuffer_albedo_alloc);
-				std::move(data.base_data.out_gbuffer_normal_alloc);
-				std::move(data.base_data.out_gbuffer_depth_alloc);
+				auto& data = fg.GetData<RTShadowData>(handle);
+				data.~RTShadowData();
 			}
 		}
 

src/render_tasks/d3d12_rtao_task.hpp

@@ -51,6 +51,7 @@ namespace wr
 		DescriptorAllocation in_depthbuffer;
 
 		bool tlas_requires_init = false;
+
 	};
 
 	namespace internal
@@ -243,14 +244,10 @@ namespace wr
 
 		inline void DestroyAOTask(FrameGraph& fg, RenderTaskHandle handle, bool resize) 
 		{
-			auto& data = fg.GetData<RTAOData>(handle);
-
 			if (!resize)
 			{
-				// Small hack to force the allocations to go out of scope, which will tell the allocator to free them
-				DescriptorAllocation temp1 = std::move(data.out_uav_from_rtv);
-				DescriptorAllocation temp2 = std::move(data.in_gbuffers);
-				DescriptorAllocation temp3 = std::move(data.in_depthbuffer);
+				auto& data = fg.GetData<RTAOData>(handle);
+				data.~RTAOData();
 			}
 		}
 	}