diff --git a/cocos/rendering/custom/layout-graph.ts b/cocos/rendering/custom/layout-graph.ts index b50bc99c0a1..9a4d2e3e587 100644 --- a/cocos/rendering/custom/layout-graph.ts +++ b/cocos/rendering/custom/layout-graph.ts @@ -1437,9 +1437,9 @@ export class LayoutGraphObjectPool { this._renderPhaseData.reset(); this._layoutGraphData.reset(); } - createDescriptorDB (): DescriptorDB { + createDescriptorDB (isDebug = true): DescriptorDB { let v: DescriptorDB; - if (this.debug) { + if (isDebug) { v = new DescriptorDB(); } else { v = this._descriptorDB.add(); @@ -1448,9 +1448,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createRenderPhase (): RenderPhase { + createRenderPhase (isDebug = true): RenderPhase { let v: RenderPhase; - if (this.debug) { + if (isDebug) { v = new RenderPhase(); } else { v = this._renderPhase.add(); @@ -1459,9 +1459,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createLayoutGraph (): LayoutGraph { + createLayoutGraph (isDebug = true): LayoutGraph { let v: LayoutGraph; - if (this.debug) { + if (isDebug) { v = new LayoutGraph(); } else { v = this._layoutGraph.add(); @@ -1474,9 +1474,10 @@ export class LayoutGraphObjectPool { uniformID = 0xFFFFFFFF, uniformType: Type = Type.UNKNOWN, offset = 0, + isDebug = true, ): UniformData { let v: UniformData; - if (this.debug) { + if (isDebug) { v = new UniformData(); } else { v = this._uniformData.add(); @@ -1485,9 +1486,9 @@ export class LayoutGraphObjectPool { v.reset(uniformID, uniformType, offset); return v; } - createUniformBlockData (): UniformBlockData { + createUniformBlockData (isDebug = true): UniformBlockData { let v: UniformBlockData; - if (this.debug) { + if (isDebug) { v = new UniformBlockData(); } else { v = this._uniformBlockData.add(); @@ -1500,9 +1501,10 @@ export class LayoutGraphObjectPool { descriptorID = 0, type: Type = Type.UNKNOWN, count = 1, + isDebug = true, ): DescriptorData { let v: DescriptorData; - if (this.debug) { + if (isDebug) { v = new DescriptorData(); } else { v = this._descriptorData.add(); @@ -1515,9 +1517,10 @@ export class LayoutGraphObjectPool { type: DescriptorTypeOrder = DescriptorTypeOrder.UNIFORM_BUFFER, visibility: ShaderStageFlagBit = ShaderStageFlagBit.NONE, capacity = 0, + isDebug = true, ): DescriptorBlockData { let v: DescriptorBlockData; - if (this.debug) { + if (isDebug) { v = new DescriptorBlockData(); } else { v = this._descriptorBlockData.add(); @@ -1529,9 +1532,10 @@ export class LayoutGraphObjectPool { createDescriptorSetLayoutData ( slot = 0xFFFFFFFF, capacity = 0, + isDebug = true, ): DescriptorSetLayoutData { let v: DescriptorSetLayoutData; - if (this.debug) { + if (isDebug) { v = new DescriptorSetLayoutData(); } else { v = this._descriptorSetLayoutData.add(); @@ -1543,9 +1547,10 @@ export class LayoutGraphObjectPool { createDescriptorSetData ( descriptorSetLayout: DescriptorSetLayout | null = null, descriptorSet: DescriptorSet | null = null, + isDebug = true, ): DescriptorSetData { let v: DescriptorSetData; - if (this.debug) { + if (isDebug) { v = new DescriptorSetData(); } else { v = this._descriptorSetData.add(); @@ -1554,9 +1559,9 @@ export class LayoutGraphObjectPool { v.reset(descriptorSetLayout, descriptorSet); return v; } - createPipelineLayoutData (): PipelineLayoutData { + createPipelineLayoutData (isDebug = true): PipelineLayoutData { let v: PipelineLayoutData; - if (this.debug) { + if (isDebug) { v = new PipelineLayoutData(); } else { v = this._pipelineLayoutData.add(); @@ -1565,9 +1570,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createShaderBindingData (): ShaderBindingData { + createShaderBindingData (isDebug = true): ShaderBindingData { let v: ShaderBindingData; - if (this.debug) { + if (isDebug) { v = new ShaderBindingData(); } else { v = this._shaderBindingData.add(); @@ -1576,9 +1581,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createShaderLayoutData (): ShaderLayoutData { + createShaderLayoutData (isDebug = true): ShaderLayoutData { let v: ShaderLayoutData; - if (this.debug) { + if (isDebug) { v = new ShaderLayoutData(); } else { v = this._shaderLayoutData.add(); @@ -1587,9 +1592,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createTechniqueData (): TechniqueData { + createTechniqueData (isDebug = true): TechniqueData { let v: TechniqueData; - if (this.debug) { + if (isDebug) { v = new TechniqueData(); } else { v = this._techniqueData.add(); @@ -1598,9 +1603,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createEffectData (): EffectData { + createEffectData (isDebug = true): EffectData { let v: EffectData; - if (this.debug) { + if (isDebug) { v = new EffectData(); } else { v = this._effectData.add(); @@ -1609,9 +1614,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createShaderProgramData (): ShaderProgramData { + createShaderProgramData (isDebug = true): ShaderProgramData { let v: ShaderProgramData; - if (this.debug) { + if (isDebug) { v = new ShaderProgramData(); } else { v = this._shaderProgramData.add(); @@ -1620,9 +1625,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createRenderStageData (): RenderStageData { + createRenderStageData (isDebug = true): RenderStageData { let v: RenderStageData; - if (this.debug) { + if (isDebug) { v = new RenderStageData(); } else { v = this._renderStageData.add(); @@ -1631,9 +1636,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createRenderPhaseData (): RenderPhaseData { + createRenderPhaseData (isDebug = true): RenderPhaseData { let v: RenderPhaseData; - if (this.debug) { + if (isDebug) { v = new RenderPhaseData(); } else { v = this._renderPhaseData.add(); @@ -1642,9 +1647,9 @@ export class LayoutGraphObjectPool { v.reset(); return v; } - createLayoutGraphData (): LayoutGraphData { + createLayoutGraphData (isDebug = true): LayoutGraphData { let v: LayoutGraphData; - if (this.debug) { + if (isDebug) { v = new LayoutGraphData(); } else { v = this._layoutGraphData.add(); diff --git a/cocos/rendering/custom/render-graph.ts b/cocos/rendering/custom/render-graph.ts index 8cfd6d5e5a3..05b4e000448 100644 --- a/cocos/rendering/custom/render-graph.ts +++ b/cocos/rendering/custom/render-graph.ts @@ -2697,9 +2697,10 @@ export class RenderGraphObjectPool { y = 0, z = 0, w = 0, + isDebug = true, ): ClearValue { let v: ClearValue; - if (this.debug) { + if (isDebug) { v = new ClearValue(); } else { v = this._clearValue.add(); @@ -2716,9 +2717,10 @@ export class RenderGraphObjectPool { storeOp: StoreOp = StoreOp.STORE, clearFlags: ClearFlagBit = ClearFlagBit.ALL, shaderStageFlags: ShaderStageFlagBit = ShaderStageFlagBit.NONE, + isDebug = true, ): RasterView { let v: RasterView; - if (this.debug) { + if (isDebug) { v = new RasterView(); } else { v = this._rasterView.add(); @@ -2733,9 +2735,10 @@ export class RenderGraphObjectPool { clearFlags: ClearFlagBit = ClearFlagBit.NONE, clearValueType: ClearValueType = ClearValueType.NONE, shaderStageFlags: ShaderStageFlagBit = ShaderStageFlagBit.NONE, + isDebug = true, ): ComputeView { let v: ComputeView; - if (this.debug) { + if (isDebug) { v = new ComputeView(); } else { v = this._computeView.add(); @@ -2744,9 +2747,9 @@ export class RenderGraphObjectPool { v.reset(name, accessType, clearFlags, clearValueType, shaderStageFlags); return v; } - createResourceDesc (): ResourceDesc { + createResourceDesc (isDebug = true): ResourceDesc { let v: ResourceDesc; - if (this.debug) { + if (isDebug) { v = new ResourceDesc(); } else { v = this._resourceDesc.add(); @@ -2757,9 +2760,10 @@ export class RenderGraphObjectPool { } createResourceTraits ( residency: ResourceResidency = ResourceResidency.MANAGED, + isDebug = true, ): ResourceTraits { let v: ResourceTraits; - if (this.debug) { + if (isDebug) { v = new ResourceTraits(); } else { v = this._resourceTraits.add(); @@ -2770,9 +2774,10 @@ export class RenderGraphObjectPool { } createRenderSwapchain ( swapchain: Swapchain | null = null, + isDebug = true, ): RenderSwapchain { let v: RenderSwapchain; - if (this.debug) { + if (isDebug) { v = new RenderSwapchain(); } else { v = this._renderSwapchain.add(); @@ -2781,9 +2786,9 @@ export class RenderGraphObjectPool { v.reset(swapchain); return v; } - createResourceStates (): ResourceStates { + createResourceStates (isDebug = true): ResourceStates { let v: ResourceStates; - if (this.debug) { + if (isDebug) { v = new ResourceStates(); } else { v = this._resourceStates.add(); @@ -2794,9 +2799,10 @@ export class RenderGraphObjectPool { } createManagedBuffer ( buffer: Buffer | null = null, + isDebug = true, ): ManagedBuffer { let v: ManagedBuffer; - if (this.debug) { + if (isDebug) { v = new ManagedBuffer(); } else { v = this._managedBuffer.add(); @@ -2807,9 +2813,10 @@ export class RenderGraphObjectPool { } createPersistentBuffer ( buffer: Buffer | null = null, + isDebug = true, ): PersistentBuffer { let v: PersistentBuffer; - if (this.debug) { + if (isDebug) { v = new PersistentBuffer(); } else { v = this._persistentBuffer.add(); @@ -2820,9 +2827,10 @@ export class RenderGraphObjectPool { } createManagedTexture ( texture: Texture | null = null, + isDebug = true, ): ManagedTexture { let v: ManagedTexture; - if (this.debug) { + if (isDebug) { v = new ManagedTexture(); } else { v = this._managedTexture.add(); @@ -2833,9 +2841,10 @@ export class RenderGraphObjectPool { } createPersistentTexture ( texture: Texture | null = null, + isDebug = true, ): PersistentTexture { let v: PersistentTexture; - if (this.debug) { + if (isDebug) { v = new PersistentTexture(); } else { v = this._persistentTexture.add(); @@ -2844,9 +2853,9 @@ export class RenderGraphObjectPool { v.reset(texture); return v; } - createManagedResource (): ManagedResource { + createManagedResource (isDebug = true): ManagedResource { let v: ManagedResource; - if (this.debug) { + if (isDebug) { v = new ManagedResource(); } else { v = this._managedResource.add(); @@ -2855,9 +2864,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createSubpass (): Subpass { + createSubpass (isDebug = true): Subpass { let v: Subpass; - if (this.debug) { + if (isDebug) { v = new Subpass(); } else { v = this._subpass.add(); @@ -2866,9 +2875,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createSubpassGraph (): SubpassGraph { + createSubpassGraph (isDebug = true): SubpassGraph { let v: SubpassGraph; - if (this.debug) { + if (isDebug) { v = new SubpassGraph(); } else { v = this._subpassGraph.add(); @@ -2881,9 +2890,10 @@ export class RenderGraphObjectPool { subpassID = 0xFFFFFFFF, count = 1, quality = 0, + isDebug = true, ): RasterSubpass { let v: RasterSubpass; - if (this.debug) { + if (isDebug) { v = new RasterSubpass(); } else { v = this._rasterSubpass.add(); @@ -2894,9 +2904,10 @@ export class RenderGraphObjectPool { } createComputeSubpass ( subpassID = 0xFFFFFFFF, + isDebug = true, ): ComputeSubpass { let v: ComputeSubpass; - if (this.debug) { + if (isDebug) { v = new ComputeSubpass(); } else { v = this._computeSubpass.add(); @@ -2905,9 +2916,9 @@ export class RenderGraphObjectPool { v.reset(subpassID); return v; } - createRasterPass (): RasterPass { + createRasterPass (isDebug = true): RasterPass { let v: RasterPass; - if (this.debug) { + if (isDebug) { v = new RasterPass(); } else { v = this._rasterPass.add(); @@ -2919,9 +2930,10 @@ export class RenderGraphObjectPool { createPersistentRenderPassAndFramebuffer ( renderPass: RenderPass | null = null, framebuffer: Framebuffer | null = null, + isDebug = true, ): PersistentRenderPassAndFramebuffer { let v: PersistentRenderPassAndFramebuffer; - if (this.debug) { + if (isDebug) { v = new PersistentRenderPassAndFramebuffer(); } else { v = this._persistentRenderPassAndFramebuffer.add(); @@ -2930,9 +2942,9 @@ export class RenderGraphObjectPool { v.reset(renderPass, framebuffer); return v; } - createFormatView (): FormatView { + createFormatView (isDebug = true): FormatView { let v: FormatView; - if (this.debug) { + if (isDebug) { v = new FormatView(); } else { v = this._formatView.add(); @@ -2941,9 +2953,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createSubresourceView (): SubresourceView { + createSubresourceView (isDebug = true): SubresourceView { let v: SubresourceView; - if (this.debug) { + if (isDebug) { v = new SubresourceView(); } else { v = this._subresourceView.add(); @@ -2952,9 +2964,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createResourceGraph (): ResourceGraph { + createResourceGraph (isDebug = true): ResourceGraph { let v: ResourceGraph; - if (this.debug) { + if (isDebug) { v = new ResourceGraph(); } else { v = this._resourceGraph.add(); @@ -2963,9 +2975,9 @@ export class RenderGraphObjectPool { v.clear(); return v; } - createComputePass (): ComputePass { + createComputePass (isDebug = true): ComputePass { let v: ComputePass; - if (this.debug) { + if (isDebug) { v = new ComputePass(); } else { v = this._computePass.add(); @@ -2974,9 +2986,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createResolvePass (): ResolvePass { + createResolvePass (isDebug = true): ResolvePass { let v: ResolvePass; - if (this.debug) { + if (isDebug) { v = new ResolvePass(); } else { v = this._resolvePass.add(); @@ -2985,9 +2997,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createCopyPass (): CopyPass { + createCopyPass (isDebug = true): CopyPass { let v: CopyPass; - if (this.debug) { + if (isDebug) { v = new CopyPass(); } else { v = this._copyPass.add(); @@ -2996,9 +3008,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createMovePass (): MovePass { + createMovePass (isDebug = true): MovePass { let v: MovePass; - if (this.debug) { + if (isDebug) { v = new MovePass(); } else { v = this._movePass.add(); @@ -3007,9 +3019,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createRaytracePass (): RaytracePass { + createRaytracePass (isDebug = true): RaytracePass { let v: RaytracePass; - if (this.debug) { + if (isDebug) { v = new RaytracePass(); } else { v = this._raytracePass.add(); @@ -3021,9 +3033,10 @@ export class RenderGraphObjectPool { createClearView ( slotName = '', clearFlags: ClearFlagBit = ClearFlagBit.ALL, + isDebug = true, ): ClearView { let v: ClearView; - if (this.debug) { + if (isDebug) { v = new ClearView(); } else { v = this._clearView.add(); @@ -3035,9 +3048,10 @@ export class RenderGraphObjectPool { createRenderQueue ( hint: QueueHint = QueueHint.RENDER_OPAQUE, phaseID = 0xFFFFFFFF, + isDebug = true, ): RenderQueue { let v: RenderQueue; - if (this.debug) { + if (isDebug) { v = new RenderQueue(); } else { v = this._renderQueue.add(); @@ -3052,9 +3066,10 @@ export class RenderGraphObjectPool { flags: SceneFlags = SceneFlags.NONE, cullingFlags: CullingFlags = CullingFlags.CAMERA_FRUSTUM, shadingLight: Light | null = null, + isDebug = true, ): SceneData { let v: SceneData; - if (this.debug) { + if (isDebug) { v = new SceneData(); } else { v = this._sceneData.add(); @@ -3069,9 +3084,10 @@ export class RenderGraphObjectPool { threadGroupCountX = 0, threadGroupCountY = 0, threadGroupCountZ = 0, + isDebug = true, ): Dispatch { let v: Dispatch; - if (this.debug) { + if (isDebug) { v = new Dispatch(); } else { v = this._dispatch.add(); @@ -3085,9 +3101,10 @@ export class RenderGraphObjectPool { passID = 0, sceneFlags: SceneFlags = SceneFlags.NONE, camera: Camera | null = null, + isDebug = true, ): Blit { let v: Blit; - if (this.debug) { + if (isDebug) { v = new Blit(); } else { v = this._blit.add(); @@ -3096,9 +3113,9 @@ export class RenderGraphObjectPool { v.reset(material, passID, sceneFlags, camera); return v; } - createRenderData (): RenderData { + createRenderData (isDebug = true): RenderData { let v: RenderData; - if (this.debug) { + if (isDebug) { v = new RenderData(); } else { v = this._renderData.add(); @@ -3107,9 +3124,9 @@ export class RenderGraphObjectPool { v.reset(); return v; } - createRenderGraph (): RenderGraph { + createRenderGraph (isDebug = true): RenderGraph { let v: RenderGraph; - if (this.debug) { + if (isDebug) { v = new RenderGraph(); } else { v = this._renderGraph.add(); diff --git a/cocos/rendering/custom/types.ts b/cocos/rendering/custom/types.ts index 21d307d1d42..21ac51db9ba 100644 --- a/cocos/rendering/custom/types.ts +++ b/cocos/rendering/custom/types.ts @@ -680,9 +680,10 @@ export class RenderCommonObjectPool { level = 0, culledByLight = false, probe: ReflectionProbe | null = null, + isDebug = true, ): LightInfo { let v: LightInfo; - if (this.debug) { + if (isDebug) { v = new LightInfo(); } else { v = this._lightInfo.add(); @@ -693,9 +694,10 @@ export class RenderCommonObjectPool { } createDescriptor ( type: Type = Type.UNKNOWN, + isDebug = true, ): Descriptor { let v: Descriptor; - if (this.debug) { + if (isDebug) { v = new Descriptor(); } else { v = this._descriptor.add(); @@ -704,9 +706,9 @@ export class RenderCommonObjectPool { v.reset(type); return v; } - createDescriptorBlock (): DescriptorBlock { + createDescriptorBlock (isDebug = true): DescriptorBlock { let v: DescriptorBlock; - if (this.debug) { + if (isDebug) { v = new DescriptorBlock(); } else { v = this._descriptorBlock.add(); @@ -715,9 +717,9 @@ export class RenderCommonObjectPool { v.reset(); return v; } - createDescriptorBlockFlattened (): DescriptorBlockFlattened { + createDescriptorBlockFlattened (isDebug = true): DescriptorBlockFlattened { let v: DescriptorBlockFlattened; - if (this.debug) { + if (isDebug) { v = new DescriptorBlockFlattened(); } else { v = this._descriptorBlockFlattened.add(); @@ -731,9 +733,10 @@ export class RenderCommonObjectPool { parameterType: ParameterType = ParameterType.CONSTANTS, descriptorType: DescriptorTypeOrder = DescriptorTypeOrder.UNIFORM_BUFFER, visibility: ShaderStageFlagBit = ShaderStageFlagBit.NONE, + isDebug = true, ): DescriptorBlockIndex { let v: DescriptorBlockIndex; - if (this.debug) { + if (isDebug) { v = new DescriptorBlockIndex(); } else { v = this._descriptorBlockIndex.add(); @@ -751,9 +754,10 @@ export class RenderCommonObjectPool { resolveFlags: ResolveFlags = ResolveFlags.NONE, mode: ResolveMode = ResolveMode.SAMPLE_ZERO, mode1: ResolveMode = ResolveMode.SAMPLE_ZERO, + isDebug = true, ): ResolvePair { let v: ResolvePair; - if (this.debug) { + if (isDebug) { v = new ResolvePair(); } else { v = this._resolvePair.add(); @@ -773,9 +777,10 @@ export class RenderCommonObjectPool { targetMostDetailedMip = 0, targetFirstSlice = 0, targetPlaneSlice = 0, + isDebug = true, ): CopyPair { let v: CopyPair; - if (this.debug) { + if (isDebug) { v = new CopyPair(); } else { v = this._copyPair.add(); @@ -791,9 +796,10 @@ export class RenderCommonObjectPool { targetMostDetailedMip = 0, targetFirstSlice = 0, targetPlaneSlice = 0, + isDebug = true, ): UploadPair { let v: UploadPair; - if (this.debug) { + if (isDebug) { v = new UploadPair(); } else { v = this._uploadPair.add(); @@ -810,9 +816,10 @@ export class RenderCommonObjectPool { targetMostDetailedMip = 0, targetFirstSlice = 0, targetPlaneSlice = 0, + isDebug = true, ): MovePair { let v: MovePair; - if (this.debug) { + if (isDebug) { v = new MovePair(); } else { v = this._movePair.add(); @@ -821,9 +828,9 @@ export class RenderCommonObjectPool { v.reset(source, target, mipLevels, numSlices, targetMostDetailedMip, targetFirstSlice, targetPlaneSlice); return v; } - createPipelineStatistics (): PipelineStatistics { + createPipelineStatistics (isDebug = true): PipelineStatistics { let v: PipelineStatistics; - if (this.debug) { + if (isDebug) { v = new PipelineStatistics(); } else { v = this._pipelineStatistics.add();