memory usage check (#11716)

* memory usage check
This commit is contained in:
minggo
2022-06-28 14:31:13 +08:00
committed by GitHub
parent 035cefdd7f
commit 98d58f69a0
4 changed files with 27 additions and 25 deletions
@@ -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();
@@ -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<const scene::Light *, gfx::Framebuffer *> &getShadowFramebufferMap() const { return _shadowFrameBufferMap; }
inline void setShadowFramebuffer(const scene::Light *light, gfx::Framebuffer *framebuffer) { _shadowFrameBufferMap[light] = framebuffer; }
inline const ccstd::unordered_map<const scene::Light *, IntrusivePtr<gfx::Framebuffer>> &getShadowFramebufferMap() const { return _shadowFrameBufferMap; }
inline const RenderObjectList &getRenderObjects() const { return _renderObjects; }
inline void setRenderObjects(RenderObjectList &&ro) { _renderObjects = std::forward<RenderObjectList>(ro); }
inline const ccstd::vector<const scene::Light *> &getValidPunctualLights() const { return _validPunctualLights; }
inline void setValidPunctualLights(ccstd::vector<const scene::Light *> &&validPunctualLights) { _validPunctualLights = std::forward<ccstd::vector<const scene::Light *>>(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<const scene::Light *> _validPunctualLights;
gfx::Buffer *_occlusionQueryVertexBuffer{nullptr};
gfx::Buffer *_occlusionQueryIndicesBuffer{nullptr};
gfx::InputAssembler *_occlusionQueryInputAssembler{nullptr};
IntrusivePtr<gfx::Buffer> _occlusionQueryVertexBuffer;
IntrusivePtr<gfx::Buffer> _occlusionQueryIndicesBuffer;
IntrusivePtr<gfx::InputAssembler> _occlusionQueryInputAssembler;
IntrusivePtr<Material> _occlusionQueryMaterial{nullptr};
gfx::Shader *_occlusionQueryShader{nullptr}; // weak reference
@@ -109,20 +110,26 @@ protected:
ccstd::vector<gfx::Shader *> _geometryRendererShaders; // weak reference
IntrusivePtr<Material> _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<const scene::Light *, gfx::Framebuffer *> _shadowFrameBufferMap;
ccstd::unordered_map<const scene::Light *, IntrusivePtr<gfx::Framebuffer>> _shadowFrameBufferMap;
};
} // namespace pipeline
@@ -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<ShadowStage *>(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<ShadowStage *>(stage);
shadowStage->setUsage(globalDS, light, shadowFrameBuffer);
+1
View File
@@ -343,6 +343,7 @@ public:
float _fogRange{1.2F};
// @serializable
bool _accurate{false};
// weak reference
Fog *_resource{nullptr};
};