diff --git a/native/cocos/renderer/pipeline/PipelineSceneData.cpp b/native/cocos/renderer/pipeline/PipelineSceneData.cpp index 2557617a20..6b46116a3e 100644 --- a/native/cocos/renderer/pipeline/PipelineSceneData.cpp +++ b/native/cocos/renderer/pipeline/PipelineSceneData.cpp @@ -41,7 +41,7 @@ namespace cc { namespace pipeline { PipelineSceneData::PipelineSceneData() { - _fog = ccnew scene::Fog(); // cjh how to delete? + _fog = ccnew scene::Fog(); _ambient = ccnew scene::Ambient(); _skybox = ccnew scene::Skybox(); _shadow = ccnew scene::Shadows(); @@ -50,7 +50,7 @@ PipelineSceneData::PipelineSceneData() { } PipelineSceneData::~PipelineSceneData() { - CC_SAFE_DELETE(_fog); // cjh correct ? + CC_SAFE_DELETE(_fog); CC_SAFE_DELETE(_ambient); CC_SAFE_DELETE(_skybox); CC_SAFE_DELETE(_shadow); @@ -66,23 +66,17 @@ void PipelineSceneData::activate(gfx::Device *device) { } void PipelineSceneData::destroy() { - for (const auto &pair : _shadowFrameBufferMap) { - pair.second->destroy(); - delete pair.second; - } - _shadowFrameBufferMap.clear(); _validPunctualLights.clear(); - CC_SAFE_DESTROY_AND_DELETE(_occlusionQueryInputAssembler); - CC_SAFE_DESTROY_AND_DELETE(_occlusionQueryVertexBuffer); - CC_SAFE_DESTROY_AND_DELETE(_occlusionQueryIndicesBuffer); + _occlusionQueryInputAssembler = nullptr; + _occlusionQueryVertexBuffer = nullptr; + _occlusionQueryIndicesBuffer = nullptr; } void PipelineSceneData::initOcclusionQuery() { - if (!_occlusionQueryInputAssembler) { - _occlusionQueryInputAssembler = createOcclusionQueryIA(); - } + CC_ASSERT(!_occlusionQueryInputAssembler); + _occlusionQueryInputAssembler = createOcclusionQueryIA(); if (!_occlusionQueryMaterial) { _occlusionQueryMaterial = ccnew Material(); diff --git a/native/cocos/renderer/pipeline/PipelineSceneData.h b/native/cocos/renderer/pipeline/PipelineSceneData.h index 1a0e7ef1a4..05c026109f 100644 --- a/native/cocos/renderer/pipeline/PipelineSceneData.h +++ b/native/cocos/renderer/pipeline/PipelineSceneData.h @@ -29,6 +29,7 @@ #include "base/RefCounted.h" #include "core/assets/Material.h" #include "renderer/pipeline/shadow/CSMLayers.h" +#include "renderer/gfx-base/GFXFramebuffer.h" namespace cc { @@ -55,12 +56,11 @@ public: virtual void updatePipelineSceneData() {} - inline void setShadowFramebuffer(const scene::Light *light, gfx::Framebuffer *framebuffer) { _shadowFrameBufferMap.emplace(light, framebuffer); } - inline const ccstd::unordered_map &getShadowFramebufferMap() const { return _shadowFrameBufferMap; } + inline void setShadowFramebuffer(const scene::Light *light, gfx::Framebuffer *framebuffer) { _shadowFrameBufferMap[light] = framebuffer; } + inline const ccstd::unordered_map> &getShadowFramebufferMap() const { return _shadowFrameBufferMap; } inline const RenderObjectList &getRenderObjects() const { return _renderObjects; } inline void setRenderObjects(RenderObjectList &&ro) { _renderObjects = std::forward(ro); } inline const ccstd::vector &getValidPunctualLights() const { return _validPunctualLights; } - inline void setValidPunctualLights(ccstd::vector &&validPunctualLights) { _validPunctualLights = std::forward>(validPunctualLights); } inline bool isHDR() const { return _isHDR; } inline void setHDR(bool val) { _isHDR = val; } inline scene::Shadows *getShadows() const { return _shadow; } @@ -95,10 +95,11 @@ protected: static constexpr uint32_t GEOMETRY_RENDERER_TECHNIQUE_COUNT{6}; RenderObjectList _renderObjects; + // `scene::Light *`: weak reference ccstd::vector _validPunctualLights; - gfx::Buffer *_occlusionQueryVertexBuffer{nullptr}; - gfx::Buffer *_occlusionQueryIndicesBuffer{nullptr}; - gfx::InputAssembler *_occlusionQueryInputAssembler{nullptr}; + IntrusivePtr _occlusionQueryVertexBuffer; + IntrusivePtr _occlusionQueryIndicesBuffer; + IntrusivePtr _occlusionQueryInputAssembler; IntrusivePtr _occlusionQueryMaterial{nullptr}; gfx::Shader *_occlusionQueryShader{nullptr}; // weak reference @@ -109,20 +110,26 @@ protected: ccstd::vector _geometryRendererShaders; // weak reference IntrusivePtr _debugRendererMaterial{nullptr}; - gfx::Shader *_debugRendererShader{nullptr}; - scene::Pass *_debugRendererPass{nullptr}; - gfx::Device *_device{nullptr}; + gfx::Shader *_debugRendererShader{nullptr}; // weak reference + scene::Pass *_debugRendererPass{nullptr}; // weak reference + gfx::Device *_device{nullptr}; // weak reference + // manage memory manually scene::Fog *_fog{nullptr}; + // manage memory manually scene::Ambient *_ambient{nullptr}; + // manage memory manually scene::Skybox *_skybox{nullptr}; + // manage memory manually scene::Shadows *_shadow{nullptr}; + // manage memory manually scene::Octree *_octree{nullptr}; + // manage memory manually CSMLayers *_csmLayers{nullptr}; bool _isHDR{true}; float _shadingScale{1.0F}; - ccstd::unordered_map _shadowFrameBufferMap; + ccstd::unordered_map> _shadowFrameBufferMap; }; } // namespace pipeline diff --git a/native/cocos/renderer/pipeline/shadow/ShadowFlow.cpp b/native/cocos/renderer/pipeline/shadow/ShadowFlow.cpp index 80b2f5254e..905a510bc3 100644 --- a/native/cocos/renderer/pipeline/shadow/ShadowFlow.cpp +++ b/native/cocos/renderer/pipeline/shadow/ShadowFlow.cpp @@ -165,7 +165,7 @@ void ShadowFlow::clearShadowMap(scene::Camera *camera) { initShadowFrameBuffer(_pipeline, mainLight); } - auto *shadowFrameBuffer = shadowFramebufferMap.at(mainLight); + auto *shadowFrameBuffer = shadowFramebufferMap.at(mainLight).get(); for (auto *stage : _stages) { auto *shadowStage = static_cast(stage); shadowStage->setUsage(globalDS, mainLight, shadowFrameBuffer); @@ -181,7 +181,7 @@ void ShadowFlow::clearShadowMap(scene::Camera *camera) { continue; } - auto *shadowFrameBuffer = shadowFramebufferMap.at(light); + auto *shadowFrameBuffer = shadowFramebufferMap.at(light).get(); for (auto *stage : _stages) { auto *shadowStage = static_cast(stage); shadowStage->setUsage(globalDS, light, shadowFrameBuffer); diff --git a/native/cocos/scene/Fog.h b/native/cocos/scene/Fog.h index f11743628e..9b222ab157 100644 --- a/native/cocos/scene/Fog.h +++ b/native/cocos/scene/Fog.h @@ -343,6 +343,7 @@ public: float _fogRange{1.2F}; // @serializable bool _accurate{false}; + // weak reference Fog *_resource{nullptr}; };