From f62a4e16ae9830f6307c124c0bfef02da57efff0 Mon Sep 17 00:00:00 2001 From: troublemaker52025 Date: Fri, 16 Apr 2021 01:45:31 -0500 Subject: [PATCH] fix lightingQueue memory leak for v3.1 (#3413) * fix lightingQueue memory leak for v3.1 * fix ci error --- .../pipeline/RenderAdditiveLightQueue.cpp | 48 ++++++------------- .../pipeline/RenderAdditiveLightQueue.h | 10 ++-- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp index 0804cfe49c..76b7a28b38 100644 --- a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp +++ b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.cpp @@ -47,7 +47,7 @@ namespace cc { namespace pipeline { -RenderAdditiveLightQueue::RenderAdditiveLightQueue(RenderPipeline *pipeline) : _pipeline(static_cast(pipeline)), +RenderAdditiveLightQueue::RenderAdditiveLightQueue(RenderPipeline *pipeline) : _pipeline(dynamic_cast(pipeline)), _instancedQueue(CC_NEW(RenderInstancedQueue)), _batchedQueue(CC_NEW(RenderBatchedQueue)) { auto * device = gfx::Device::getInstance(); @@ -64,20 +64,22 @@ RenderAdditiveLightQueue::RenderAdditiveLightQueue(RenderPipeline *pipeline) : _ _lightBufferData.resize(_lightBufferElementCount * _lightBufferCount); _dynamicOffsets.resize(1, 0); - gfx::SamplerInfo info{ + const gfx::SamplerInfo info{ gfx::Filter::LINEAR, gfx::Filter::LINEAR, gfx::Filter::NONE, gfx::Address::CLAMP, gfx::Address::CLAMP, gfx::Address::CLAMP, + {}, + {}, + {}, + {}, }; const auto shadowMapSamplerHash = SamplerLib::genSamplerHash(info); _sampler = SamplerLib::getSampler(shadowMapSamplerHash); - _phaseID = getPhaseID("forward-add"); - _globalUBO.fill(0.F); _shadowUBO.fill(0.F); } @@ -117,7 +119,7 @@ void RenderAdditiveLightQueue::recordCommandBuffer(gfx::Device *device, gfx::Ren } } -void RenderAdditiveLightQueue::gatherLightPasses(const Camera *camera, gfx::CommandBuffer *cmdBufferer) { +void RenderAdditiveLightQueue::gatherLightPasses(const Camera *camera, gfx::CommandBuffer *cmdBuffer) { static vector lightPassIndices; clear(); @@ -126,8 +128,8 @@ void RenderAdditiveLightQueue::gatherLightPasses(const Camera *camera, gfx::Comm if (_validLights.empty()) return; - updateUBOs(camera, cmdBufferer); - updateLightDescriptorSet(camera, cmdBufferer); + updateUBOs(camera, cmdBuffer); + updateLightDescriptorSet(camera, cmdBuffer); const auto &renderObjects = _pipeline->getPipelineSceneData()->getRenderObjects(); for (const auto &renderObject : renderObjects) { @@ -158,14 +160,13 @@ void RenderAdditiveLightQueue::gatherLightPasses(const Camera *camera, gfx::Comm addRenderQueue(pass, subModel, model, lightPassIdx); } } - _instancedQueue->uploadBuffers(cmdBufferer); - _batchedQueue->uploadBuffers(cmdBufferer); + _instancedQueue->uploadBuffers(cmdBuffer); + _batchedQueue->uploadBuffers(cmdBuffer); } void RenderAdditiveLightQueue::destroy() { for (auto &pair : _descriptorSetMap) { auto *descriptorSet = pair.second; - descriptorSet->getBuffer(UBOGlobal::BINDING)->destroy(); descriptorSet->getBuffer(UBOShadow::BINDING)->destroy(); descriptorSet->getSampler(SHADOWMAP::BINDING)->destroy(); descriptorSet->getTexture(SHADOWMAP::BINDING)->destroy(); @@ -343,12 +344,8 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const Camera *camera, gf descriptorSet->bindTexture(SHADOWMAP::BINDING, _pipeline->getDefaultTexture()); descriptorSet->update(); - _globalUBO.fill(0.0F); _shadowUBO.fill(0.0F); - PipelineUBO::updateGlobalUBOView(_pipeline, _globalUBO); - PipelineUBO::updateCameraUBOView(_pipeline, _cameraUBO, camera, camera->getWindow()->hasOffScreenAttachments); - switch (light->getType()) { case LightType::SPOT: { // update planar PROJ @@ -387,13 +384,12 @@ void RenderAdditiveLightQueue::updateLightDescriptorSet(const Camera *camera, gf } // Reserve sphere light shadow interface } break; - default:; + default: + break; } descriptorSet->update(); cmdBuffer->updateBuffer(descriptorSet->getBuffer(UBOShadow::BINDING), _shadowUBO.data(), UBOShadow::SIZE); - cmdBuffer->updateBuffer(descriptorSet->getBuffer(UBOGlobal::BINDING), _globalUBO.data(), UBOGlobal::SIZE); - cmdBuffer->updateBuffer(descriptorSet->getBuffer(UBOCamera::BINDING), _cameraUBO.data(), UBOCamera::SIZE); } } @@ -425,23 +421,9 @@ gfx::DescriptorSet *RenderAdditiveLightQueue::getOrCreateDescriptorSet(const Lig auto * device = gfx::Device::getInstance(); gfx::DescriptorSet *descriptorSet = device->createDescriptorSet({_pipeline->getDescriptorSetLayout()}); - auto *globalUBO = device->createBuffer({ - gfx::BufferUsageBit::UNIFORM | gfx::BufferUsageBit::TRANSFER_DST, - gfx::MemoryUsageBit::HOST | gfx::MemoryUsageBit::DEVICE, - UBOGlobal::SIZE, - UBOGlobal::SIZE, - gfx::BufferFlagBit::NONE, - }); - descriptorSet->bindBuffer(UBOGlobal::BINDING, globalUBO); + descriptorSet->bindBuffer(UBOGlobal::BINDING, _pipeline->getDescriptorSet()->getBuffer(UBOGlobal::BINDING)); - auto *cameraUBO = device->createBuffer({ - gfx::BufferUsageBit::UNIFORM | gfx::BufferUsageBit::TRANSFER_DST, - gfx::MemoryUsageBit::HOST | gfx::MemoryUsageBit::DEVICE, - UBOCamera::SIZE, - UBOCamera::SIZE, - gfx::BufferFlagBit::NONE, - }); - descriptorSet->bindBuffer(UBOCamera::BINDING, cameraUBO); + descriptorSet->bindBuffer(UBOCamera::BINDING, _pipeline->getDescriptorSet()->getBuffer(UBOCamera::BINDING)); auto *shadowUBO = device->createBuffer({ gfx::BufferUsageBit::UNIFORM | gfx::BufferUsageBit::TRANSFER_DST, diff --git a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.h b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.h index 1859c4e2db..1f7141ab46 100644 --- a/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.h +++ b/native/cocos/renderer/pipeline/RenderAdditiveLightQueue.h @@ -66,11 +66,9 @@ private: void gatherValidLights(const Camera *camera); void addRenderQueue(const PassView *pass, const SubModelView *subModel, const ModelView *model, uint lightPassIdx); void updateUBOs(const Camera *camera, gfx::CommandBuffer *cmdBuffer); - void updateCameraUBO(const Camera *camera, gfx::CommandBuffer *cmdBuffer, bool hasOffScreenAttachments); void updateLightDescriptorSet(const Camera *camera, gfx::CommandBuffer *cmdBuffer); - void updateGlobalDescriptorSet(const Camera *camera, gfx::CommandBuffer *cmdBuffer); bool getLightPassIndex(const ModelView *model, vector *lightPassIndices) const; - gfx::DescriptorSet *getOrCreateDescriptorSet(const Light *); + gfx::DescriptorSet *getOrCreateDescriptorSet(const Light *light); ForwardPipeline * _pipeline = nullptr; vector> _sortedSubModelsArray; @@ -86,10 +84,8 @@ private: gfx::Buffer * _firstLightBufferView = nullptr; gfx::Sampler * _sampler = nullptr; - std::unordered_map _descriptorSetMap; - std::array _globalUBO; - std::array _cameraUBO; - std::array _shadowUBO; + std::unordered_map _descriptorSetMap{}; + std::array _shadowUBO{}; uint _lightBufferStride = 0; uint _lightBufferElementCount = 0;