From d553ce2bdbc26e4a6edd17ee010e450dbebabd28 Mon Sep 17 00:00:00 2001 From: James Chen Date: Tue, 26 Jul 2022 18:01:53 +0800 Subject: [PATCH] [v3.6.0] Fix memory leaks (#12185) --- native/cocos/bindings/jswrapper/v8/ScriptEngine.cpp | 6 +++++- .../cocos/editor-support/dragonbones/core/DragonBones.cpp | 5 +++-- native/cocos/renderer/pipeline/PlanarShadowQueue.cpp | 7 ++++++- native/cocos/renderer/pipeline/forward/ForwardStage.cpp | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/native/cocos/bindings/jswrapper/v8/ScriptEngine.cpp b/native/cocos/bindings/jswrapper/v8/ScriptEngine.cpp index 494de05183..e5084f0100 100644 --- a/native/cocos/bindings/jswrapper/v8/ScriptEngine.cpp +++ b/native/cocos/bindings/jswrapper/v8/ScriptEngine.cpp @@ -585,8 +585,12 @@ bool ScriptEngine::init(v8::Isolate *isolate) { _context.Reset(_isolate, context); _context.Get(isolate)->Enter(); } else { + static v8::ArrayBuffer::Allocator *arrayBufferAllocator{nullptr}; + if (arrayBufferAllocator == nullptr) { + arrayBufferAllocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator(); + } v8::Isolate::CreateParams createParams; - createParams.array_buffer_allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator(); + createParams.array_buffer_allocator = arrayBufferAllocator; _isolate = v8::Isolate::New(createParams); v8::HandleScope hs(_isolate); _context.Reset(_isolate, v8::Context::New(_isolate)); diff --git a/native/cocos/editor-support/dragonbones/core/DragonBones.cpp b/native/cocos/editor-support/dragonbones/core/DragonBones.cpp index 7a368ab152..27e4ca216b 100644 --- a/native/cocos/editor-support/dragonbones/core/DragonBones.cpp +++ b/native/cocos/editor-support/dragonbones/core/DragonBones.cpp @@ -1,7 +1,7 @@ #include "DragonBones.h" -#include "../armature/Armature.h" -#include "../animation/WorldClock.h" #include "../animation/Animation.h" +#include "../animation/WorldClock.h" +#include "../armature/Armature.h" #include "../event/EventObject.h" #include "../event/IEventDispatcher.h" @@ -28,6 +28,7 @@ DragonBones::~DragonBones() { } _clock = nullptr; + delete _eventManager; _eventManager = nullptr; } diff --git a/native/cocos/renderer/pipeline/PlanarShadowQueue.cpp b/native/cocos/renderer/pipeline/PlanarShadowQueue.cpp index b1e478cd9e..a31cd8bee1 100644 --- a/native/cocos/renderer/pipeline/PlanarShadowQueue.cpp +++ b/native/cocos/renderer/pipeline/PlanarShadowQueue.cpp @@ -47,7 +47,9 @@ PlanarShadowQueue::PlanarShadowQueue(RenderPipeline *pipeline) _instancedQueue = ccnew RenderInstancedQueue; } -PlanarShadowQueue::~PlanarShadowQueue() = default; +PlanarShadowQueue::~PlanarShadowQueue() { + destroy(); +} void PlanarShadowQueue::gatherShadowPasses(scene::Camera *camera, gfx::CommandBuffer *cmdBuffer) { clear(); @@ -138,7 +140,10 @@ void PlanarShadowQueue::recordCommandBuffer(gfx::Device *device, gfx::RenderPass } void PlanarShadowQueue::destroy() { + _pipeline = nullptr; CC_SAFE_DELETE(_instancedQueue); + _castModels.clear(); + _pendingModels.clear(); } } // namespace pipeline diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp index fb1fb06abd..538757807f 100644 --- a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp +++ b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp @@ -90,7 +90,7 @@ void ForwardStage::destroy() { CC_SAFE_DELETE(_batchedQueue); CC_SAFE_DELETE(_instancedQueue); CC_SAFE_DELETE(_additiveLightQueue); - CC_SAFE_DELETE(_planarShadowQueue); + CC_SAFE_DESTROY_AND_DELETE(_planarShadowQueue); CC_SAFE_DELETE(_uiPhase); RenderStage::destroy(); }