GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix memory leak while doing drag&drop with Debug Draw in use

Browse Source 
#1723
This commit is contained in:
Wojtek Figat
2023-11-06 17:18:20 +01:00
parent e7b1fce3eb
commit ae85a94261
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Debug/DebugDraw.cpp
View File

@@ -696,12 +696,15 @@ void* DebugDraw::AllocateContext()
void DebugDraw::FreeContext(void* context) void DebugDraw::FreeContext(void* context)
{ {
ASSERT(context);
Memory::DestructItem((DebugDrawContext*)context); Memory::DestructItem((DebugDrawContext*)context);
Allocator::Free(context); Allocator::Free(context);
} }
void DebugDraw::UpdateContext(void* context, float deltaTime) void DebugDraw::UpdateContext(void* context, float deltaTime)
{ {
if (!context)
context = &GlobalContext;
((DebugDrawContext*)context)->DebugDrawDefault.Update(deltaTime); ((DebugDrawContext*)context)->DebugDrawDefault.Update(deltaTime);
((DebugDrawContext*)context)->DebugDrawDepthTest.Update(deltaTime); ((DebugDrawContext*)context)->DebugDrawDepthTest.Update(deltaTime);
} }

16
Source/Engine/Platform/Base/DragDropHelper.h
View File

@@ -8,6 +8,18 @@
#include "Engine/Scripting/ManagedCLR/MDomain.h" #include "Engine/Scripting/ManagedCLR/MDomain.h"
#include "Engine/Engine/Engine.h" #include "Engine/Engine/Engine.h"
#include "Engine/Platform/Platform.h" #include "Engine/Platform/Platform.h"
#if USE_EDITOR
#if !COMPILE_WITH_DEBUG_DRAW
#define COMPILE_WITH_DEBUG_DRAW 1
#define COMPILE_WITH_DEBUG_DRAW_HACK
#endif
#include "Engine/Debug/DebugDraw.h"
#ifdef COMPILE_WITH_DEBUG_DRAW_HACK
#undef COMPILE_WITH_DEBUG_DRAW_HACK
#undef COMPILE_WITH_DEBUG_DRAW
#define COMPILE_WITH_DEBUG_DRAW 0
#endif
#endif
/// <summary> /// <summary>
/// Async DoDragDrop helper (used for rendering frames during main thread stall). /// Async DoDragDrop helper (used for rendering frames during main thread stall).
@@ -23,6 +35,10 @@ public:
Scripting::GetScriptsDomain()->Dispatch(); Scripting::GetScriptsDomain()->Dispatch();
while (Platform::AtomicRead(&ExitFlag) == 0) while (Platform::AtomicRead(&ExitFlag) == 0)
{ {
#if USE_EDITOR
// Flush any single-frame shapes to prevent memory leaking (eg. via terrain collision debug during scene drawing with PhysicsColliders or PhysicsDebug flag)
DebugDraw::UpdateContext(nullptr, 0.0f);
#endif
Engine::OnDraw(); Engine::OnDraw();
Platform::Sleep(20); Platform::Sleep(20);
} }