From 3c5dcc1effb2a4e505e703f85ca8e58a782eb392 Mon Sep 17 00:00:00 2001 From: hyde zhou Date: Thu, 8 Aug 2024 17:20:25 +0800 Subject: [PATCH] simplify pool (#17516) --- cocos/rendering/custom/layout-graph.ts | 40 ++++++++------- cocos/rendering/custom/render-graph.ts | 70 ++++++++++++++------------ cocos/rendering/custom/types.ts | 24 +++++---- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/cocos/rendering/custom/layout-graph.ts b/cocos/rendering/custom/layout-graph.ts index 64005bc203..f515357110 100644 --- a/cocos/rendering/custom/layout-graph.ts +++ b/cocos/rendering/custom/layout-graph.ts @@ -853,6 +853,10 @@ export class LayoutGraphData implements BidirectionalGraph constantMacros = ''; } +function createPool (Constructor: new() => T): RecyclePool { + return new RecyclePool(() => new Constructor(), 16); +} + export class LayoutGraphObjectPool { constructor (renderCommon: RenderCommonObjectPool) { this.renderCommon = renderCommon; @@ -986,24 +990,24 @@ export class LayoutGraphObjectPool { return v; } public readonly renderCommon: RenderCommonObjectPool; - private readonly _descriptorDB: RecyclePool = new RecyclePool(() => new DescriptorDB(), 16); - private readonly _renderPhase: RecyclePool = new RecyclePool(() => new RenderPhase(), 16); - private readonly _layoutGraph: RecyclePool = new RecyclePool(() => new LayoutGraph(), 16); - private readonly _uniformData: RecyclePool = new RecyclePool(() => new UniformData(), 16); - private readonly _uniformBlockData: RecyclePool = new RecyclePool(() => new UniformBlockData(), 16); - private readonly _descriptorData: RecyclePool = new RecyclePool(() => new DescriptorData(), 16); - private readonly _descriptorBlockData: RecyclePool = new RecyclePool(() => new DescriptorBlockData(), 16); - private readonly _descriptorSetLayoutData: RecyclePool = new RecyclePool(() => new DescriptorSetLayoutData(), 16); - private readonly _descriptorSetData: RecyclePool = new RecyclePool(() => new DescriptorSetData(), 16); - private readonly _pipelineLayoutData: RecyclePool = new RecyclePool(() => new PipelineLayoutData(), 16); - private readonly _shaderBindingData: RecyclePool = new RecyclePool(() => new ShaderBindingData(), 16); - private readonly _shaderLayoutData: RecyclePool = new RecyclePool(() => new ShaderLayoutData(), 16); - private readonly _techniqueData: RecyclePool = new RecyclePool(() => new TechniqueData(), 16); - private readonly _effectData: RecyclePool = new RecyclePool(() => new EffectData(), 16); - private readonly _shaderProgramData: RecyclePool = new RecyclePool(() => new ShaderProgramData(), 16); - private readonly _renderStageData: RecyclePool = new RecyclePool(() => new RenderStageData(), 16); - private readonly _renderPhaseData: RecyclePool = new RecyclePool(() => new RenderPhaseData(), 16); - private readonly _layoutGraphData: RecyclePool = new RecyclePool(() => new LayoutGraphData(), 16); + private readonly _descriptorDB: RecyclePool = createPool(DescriptorDB); + private readonly _renderPhase: RecyclePool = createPool(RenderPhase); + private readonly _layoutGraph: RecyclePool = createPool(LayoutGraph); + private readonly _uniformData: RecyclePool = createPool(UniformData); + private readonly _uniformBlockData: RecyclePool = createPool(UniformBlockData); + private readonly _descriptorData: RecyclePool = createPool(DescriptorData); + private readonly _descriptorBlockData: RecyclePool = createPool(DescriptorBlockData); + private readonly _descriptorSetLayoutData: RecyclePool = createPool(DescriptorSetLayoutData); + private readonly _descriptorSetData: RecyclePool = createPool(DescriptorSetData); + private readonly _pipelineLayoutData: RecyclePool = createPool(PipelineLayoutData); + private readonly _shaderBindingData: RecyclePool = createPool(ShaderBindingData); + private readonly _shaderLayoutData: RecyclePool = createPool(ShaderLayoutData); + private readonly _techniqueData: RecyclePool = createPool(TechniqueData); + private readonly _effectData: RecyclePool = createPool(EffectData); + private readonly _shaderProgramData: RecyclePool = createPool(ShaderProgramData); + private readonly _renderStageData: RecyclePool = createPool(RenderStageData); + private readonly _renderPhaseData: RecyclePool = createPool(RenderPhaseData); + private readonly _layoutGraphData: RecyclePool = createPool(LayoutGraphData); } export function saveDescriptorDB (a: OutputArchive, v: DescriptorDB): void { diff --git a/cocos/rendering/custom/render-graph.ts b/cocos/rendering/custom/render-graph.ts index 5e1f3cf03e..9c3f6f486b 100644 --- a/cocos/rendering/custom/render-graph.ts +++ b/cocos/rendering/custom/render-graph.ts @@ -1485,6 +1485,10 @@ export class RenderGraph implements BidirectionalGraph readonly sortedVertices: number[] = []; } +function createPool (Constructor: new() => T): RecyclePool { + return new RecyclePool(() => new Constructor(), 16); +} + export class RenderGraphObjectPool { constructor (renderCommon: RenderCommonObjectPool) { this.renderCommon = renderCommon; @@ -1755,37 +1759,37 @@ export class RenderGraphObjectPool { return v; } public readonly renderCommon: RenderCommonObjectPool; - private readonly _clearValue: RecyclePool = new RecyclePool(() => new ClearValue(), 16); - private readonly _rasterView: RecyclePool = new RecyclePool(() => new RasterView(), 16); - private readonly _computeView: RecyclePool = new RecyclePool(() => new ComputeView(), 16); - private readonly _resourceDesc: RecyclePool = new RecyclePool(() => new ResourceDesc(), 16); - private readonly _resourceTraits: RecyclePool = new RecyclePool(() => new ResourceTraits(), 16); - private readonly _renderSwapchain: RecyclePool = new RecyclePool(() => new RenderSwapchain(), 16); - private readonly _resourceStates: RecyclePool = new RecyclePool(() => new ResourceStates(), 16); - private readonly _managedBuffer: RecyclePool = new RecyclePool(() => new ManagedBuffer(), 16); - private readonly _persistentBuffer: RecyclePool = new RecyclePool(() => new PersistentBuffer(), 16); - private readonly _managedTexture: RecyclePool = new RecyclePool(() => new ManagedTexture(), 16); - private readonly _persistentTexture: RecyclePool = new RecyclePool(() => new PersistentTexture(), 16); - private readonly _managedResource: RecyclePool = new RecyclePool(() => new ManagedResource(), 16); - private readonly _subpass: RecyclePool = new RecyclePool(() => new Subpass(), 16); - private readonly _subpassGraph: RecyclePool = new RecyclePool(() => new SubpassGraph(), 16); - private readonly _rasterSubpass: RecyclePool = new RecyclePool(() => new RasterSubpass(), 16); - private readonly _computeSubpass: RecyclePool = new RecyclePool(() => new ComputeSubpass(), 16); - private readonly _rasterPass: RecyclePool = new RecyclePool(() => new RasterPass(), 16); - private readonly _persistentRenderPassAndFramebuffer: RecyclePool = new RecyclePool(() => new PersistentRenderPassAndFramebuffer(), 16); - private readonly _formatView: RecyclePool = new RecyclePool(() => new FormatView(), 16); - private readonly _subresourceView: RecyclePool = new RecyclePool(() => new SubresourceView(), 16); - private readonly _resourceGraph: RecyclePool = new RecyclePool(() => new ResourceGraph(), 16); - private readonly _computePass: RecyclePool = new RecyclePool(() => new ComputePass(), 16); - private readonly _resolvePass: RecyclePool = new RecyclePool(() => new ResolvePass(), 16); - private readonly _copyPass: RecyclePool = new RecyclePool(() => new CopyPass(), 16); - private readonly _movePass: RecyclePool = new RecyclePool(() => new MovePass(), 16); - private readonly _raytracePass: RecyclePool = new RecyclePool(() => new RaytracePass(), 16); - private readonly _clearView: RecyclePool = new RecyclePool(() => new ClearView(), 16); - private readonly _renderQueue: RecyclePool = new RecyclePool(() => new RenderQueue(), 16); - private readonly _sceneData: RecyclePool = new RecyclePool(() => new SceneData(), 16); - private readonly _dispatch: RecyclePool = new RecyclePool(() => new Dispatch(), 16); - private readonly _blit: RecyclePool = new RecyclePool(() => new Blit(), 16); - private readonly _renderData: RecyclePool = new RecyclePool(() => new RenderData(), 16); - private readonly _renderGraph: RecyclePool = new RecyclePool(() => new RenderGraph(), 16); + private readonly _clearValue: RecyclePool = createPool(ClearValue); + private readonly _rasterView: RecyclePool = createPool(RasterView); + private readonly _computeView: RecyclePool = createPool(ComputeView); + private readonly _resourceDesc: RecyclePool = createPool(ResourceDesc); + private readonly _resourceTraits: RecyclePool = createPool(ResourceTraits); + private readonly _renderSwapchain: RecyclePool = createPool(RenderSwapchain); + private readonly _resourceStates: RecyclePool = createPool(ResourceStates); + private readonly _managedBuffer: RecyclePool = createPool(ManagedBuffer); + private readonly _persistentBuffer: RecyclePool = createPool(PersistentBuffer); + private readonly _managedTexture: RecyclePool = createPool(ManagedTexture); + private readonly _persistentTexture: RecyclePool = createPool(PersistentTexture); + private readonly _managedResource: RecyclePool = createPool(ManagedResource); + private readonly _subpass: RecyclePool = createPool(Subpass); + private readonly _subpassGraph: RecyclePool = createPool(SubpassGraph); + private readonly _rasterSubpass: RecyclePool = createPool(RasterSubpass); + private readonly _computeSubpass: RecyclePool = createPool(ComputeSubpass); + private readonly _rasterPass: RecyclePool = createPool(RasterPass); + private readonly _persistentRenderPassAndFramebuffer: RecyclePool = createPool(PersistentRenderPassAndFramebuffer); + private readonly _formatView: RecyclePool = createPool(FormatView); + private readonly _subresourceView: RecyclePool = createPool(SubresourceView); + private readonly _resourceGraph: RecyclePool = createPool(ResourceGraph); + private readonly _computePass: RecyclePool = createPool(ComputePass); + private readonly _resolvePass: RecyclePool = createPool(ResolvePass); + private readonly _copyPass: RecyclePool = createPool(CopyPass); + private readonly _movePass: RecyclePool = createPool(MovePass); + private readonly _raytracePass: RecyclePool = createPool(RaytracePass); + private readonly _clearView: RecyclePool = createPool(ClearView); + private readonly _renderQueue: RecyclePool = createPool(RenderQueue); + private readonly _sceneData: RecyclePool = createPool(SceneData); + private readonly _dispatch: RecyclePool = createPool(Dispatch); + private readonly _blit: RecyclePool = createPool(Blit); + private readonly _renderData: RecyclePool = createPool(RenderData); + private readonly _renderGraph: RecyclePool = createPool(RenderGraph); } diff --git a/cocos/rendering/custom/types.ts b/cocos/rendering/custom/types.ts index 161eebf62b..f3ad9cdcfe 100644 --- a/cocos/rendering/custom/types.ts +++ b/cocos/rendering/custom/types.ts @@ -444,6 +444,10 @@ export class PipelineStatistics { numInstancingUniformBlocks = 0; } +function createPool (Constructor: new() => T): RecyclePool { + return new RecyclePool(() => new Constructor(), 16); +} + export class RenderCommonObjectPool { constructor () { } @@ -556,16 +560,16 @@ export class RenderCommonObjectPool { v.reset(); return v; } - private readonly _lightInfo: RecyclePool = new RecyclePool(() => new LightInfo(), 16); - private readonly _descriptor: RecyclePool = new RecyclePool(() => new Descriptor(), 16); - private readonly _descriptorBlock: RecyclePool = new RecyclePool(() => new DescriptorBlock(), 16); - private readonly _descriptorBlockFlattened: RecyclePool = new RecyclePool(() => new DescriptorBlockFlattened(), 16); - private readonly _descriptorBlockIndex: RecyclePool = new RecyclePool(() => new DescriptorBlockIndex(), 16); - private readonly _resolvePair: RecyclePool = new RecyclePool(() => new ResolvePair(), 16); - private readonly _copyPair: RecyclePool = new RecyclePool(() => new CopyPair(), 16); - private readonly _uploadPair: RecyclePool = new RecyclePool(() => new UploadPair(), 16); - private readonly _movePair: RecyclePool = new RecyclePool(() => new MovePair(), 16); - private readonly _pipelineStatistics: RecyclePool = new RecyclePool(() => new PipelineStatistics(), 16); + private readonly _lightInfo: RecyclePool = createPool(LightInfo); + private readonly _descriptor: RecyclePool = createPool(Descriptor); + private readonly _descriptorBlock: RecyclePool = createPool(DescriptorBlock); + private readonly _descriptorBlockFlattened: RecyclePool = createPool(DescriptorBlockFlattened); + private readonly _descriptorBlockIndex: RecyclePool = createPool(DescriptorBlockIndex); + private readonly _resolvePair: RecyclePool = createPool(ResolvePair); + private readonly _copyPair: RecyclePool = createPool(CopyPair); + private readonly _uploadPair: RecyclePool = createPool(UploadPair); + private readonly _movePair: RecyclePool = createPool(MovePair); + private readonly _pipelineStatistics: RecyclePool = createPool(PipelineStatistics); } export function saveLightInfo (a: OutputArchive, v: LightInfo): void {