diff --git a/cocos/rendering/custom/custom-pipeline.ts b/cocos/rendering/custom/custom-pipeline.ts index ac7e67af18..71fe87ddba 100644 --- a/cocos/rendering/custom/custom-pipeline.ts +++ b/cocos/rendering/custom/custom-pipeline.ts @@ -15,7 +15,7 @@ export const BLOOM_COMBINEPASS_INDEX = BLOOM_UPSAMPLEPASS_INDEX + MAX_BLOOM_FILT export class CustomPipelineBuilder extends PipelineBuilder { protected declare _bloomMaterial: Material; protected declare _postMaterial: Material; - private _threshold = 1.0; + private _threshold = 0.1; private _iterations = 2; private _intensity = 0.8; _antiAliasing: AntiAliasing = AntiAliasing.NONE; @@ -133,7 +133,7 @@ export class CustomPipelineBuilder extends PipelineBuilder { bloomClearColor.y = camera.clearColor.y; bloomClearColor.z = camera.clearColor.z; } - bloomClearColor.w = 0; + bloomClearColor.w = camera.clearColor.w; // ==== Bloom prefilter === const bloomPassPrefilterRTName = `dsBloomPassPrefilterColor${cameraName}`; const bloomPassPrefilterDSName = `dsBloomPassPrefilterDS${cameraName}`; @@ -172,7 +172,7 @@ export class CustomPipelineBuilder extends PipelineBuilder { ppl.addRenderTarget(bloomPassDownSampleRTName, Format.RGBA8, width, height, ResourceResidency.MANAGED); ppl.addDepthStencil(bloomPassDownSampleDSName, Format.DEPTH_STENCIL, width, height, ResourceResidency.MANAGED); } - const bloomDownSamplePass = ppl.addRasterPass(width, height, 'Bloom_Downsample', `CameraBloomDownSamplePass${cameraID}${i}`); + const bloomDownSamplePass = ppl.addRasterPass(width, height, `Bloom_Downsample${i}`, `CameraBloomDownSamplePass${cameraID}${i}`); const computeView = new ComputeView(); computeView.name = 'bloomTexture'; if (i === 0) { @@ -195,15 +195,16 @@ export class CustomPipelineBuilder extends PipelineBuilder { // === Bloom upSampler === for (let i = 0; i < this._iterations; ++i) { const texSize = new Vec4(width, height, 0, 0); - const bloomPassUpSampleRTName = `dsBloomPassUpSampleColor${cameraName}${i}`; - const bloomPassUpSampleDSName = `dsBloomPassUpSampleDS${cameraName}${i}`; + const bloomPassUpSampleRTName = `dsBloomPassUpSampleColor${cameraName}${this._iterations - 1 - i}`; + const bloomPassUpSampleDSName = `dsBloomPassUpSampleDS${cameraName}${this._iterations - 1 - i}`; width <<= 1; height <<= 1; if (!ppl.containsResource(bloomPassUpSampleRTName)) { ppl.addRenderTarget(bloomPassUpSampleRTName, Format.RGBA8, width, height, ResourceResidency.MANAGED); ppl.addDepthStencil(bloomPassUpSampleDSName, Format.DEPTH_STENCIL, width, height, ResourceResidency.MANAGED); } - const bloomUpSamplePass = ppl.addRasterPass(width, height, 'Bloom_Upsample', `CameraBloomUpSamplePass${cameraID}${i}`); + const bloomUpSamplePass = ppl.addRasterPass(width, height, `Bloom_Upsample${i}`, + `CameraBloomUpSamplePass${cameraID}${this._iterations - 1 - i}`); const computeView = new ComputeView(); computeView.name = 'bloomTexture'; if (i === 0) { diff --git a/cocos/rendering/custom/effect.ts b/cocos/rendering/custom/effect.ts index 9c3f8a45bb..52785cd294 100644 --- a/cocos/rendering/custom/effect.ts +++ b/cocos/rendering/custom/effect.ts @@ -203,6 +203,57 @@ enum BloomStage { UPSAMPLE, COMBINE } + +function buildBloomDownSample (lg, idx: number) { + const bloomDownsampleID = lg.addRenderStage(`Bloom_Downsample${idx}`, BloomStage.DOWNSAMPLE); + lg.addRenderPhase('Queue', bloomDownsampleID); + const bloomDownsampleDescriptors = lg.layoutGraph.getDescriptors(bloomDownsampleID); + + const bloomDownsampleUniformBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, + ParameterType.TABLE, + DescriptorTypeOrder.UNIFORM_BUFFER, + ShaderStageFlagBit.ALL, + bloomDownsampleDescriptors); + const bloomDownsampleUBO: UniformBlock = lg.getUniformBlock(SetIndex.MATERIAL, + 0, 'BloomUBO', bloomDownsampleUniformBlock); + lg.setUniform(bloomDownsampleUBO, 'texSize', Type.FLOAT4, 1); + lg.setDescriptor(bloomDownsampleUniformBlock, 'BloomUBO', Type.UNKNOWN); + + const bloomDownsamplePassBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, + ParameterType.TABLE, + DescriptorTypeOrder.SAMPLER_TEXTURE, + ShaderStageFlagBit.FRAGMENT, + bloomDownsampleDescriptors); + lg.setDescriptor(bloomDownsamplePassBlock, 'bloomTexture', Type.SAMPLER2D); + lg.merge(bloomDownsampleDescriptors); + lg.mergeDescriptors(bloomDownsampleID); +} + +function buildBloomUpSample (lg, idx: number) { + const bloomUpsampleID = lg.addRenderStage(`Bloom_Upsample${idx}`, BloomStage.UPSAMPLE); + lg.addRenderPhase('Queue', bloomUpsampleID); + const bloomUpsampleDescriptors = lg.layoutGraph.getDescriptors(bloomUpsampleID); + + const bloomUpsampleUniformBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, + ParameterType.TABLE, + DescriptorTypeOrder.UNIFORM_BUFFER, + ShaderStageFlagBit.ALL, + bloomUpsampleDescriptors); + const bloomUpsampleUBO: UniformBlock = lg.getUniformBlock(SetIndex.MATERIAL, + 0, 'BloomUBO', bloomUpsampleUniformBlock); + lg.setUniform(bloomUpsampleUBO, 'texSize', Type.FLOAT4, 1); + lg.setDescriptor(bloomUpsampleUniformBlock, 'BloomUBO', Type.UNKNOWN); + + const bloomUpsamplePassBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, + ParameterType.TABLE, + DescriptorTypeOrder.SAMPLER_TEXTURE, + ShaderStageFlagBit.FRAGMENT, + bloomUpsampleDescriptors); + lg.setDescriptor(bloomUpsamplePassBlock, 'bloomTexture', Type.SAMPLER2D); + lg.merge(bloomUpsampleDescriptors); + lg.mergeDescriptors(bloomUpsampleID); +} + export function buildForwardLayout (ppl: Pipeline) { const lg = new WebDescriptorHierarchy(); const bFromGlobalDescriptorSet = false; @@ -236,51 +287,11 @@ export function buildForwardLayout (ppl: Pipeline) { lg.merge(bloomPrefilterDescriptors); lg.mergeDescriptors(bloomPrefilterID); // 2.=== Bloom downsample === - const bloomDownsampleID = lg.addRenderStage('Bloom_Downsample', BloomStage.DOWNSAMPLE); - lg.addRenderPhase('Queue', bloomDownsampleID); - const bloomDownsampleDescriptors = lg.layoutGraph.getDescriptors(bloomDownsampleID); - - const bloomDownsampleUniformBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, - ParameterType.TABLE, - DescriptorTypeOrder.UNIFORM_BUFFER, - ShaderStageFlagBit.ALL, - bloomDownsampleDescriptors); - const bloomDownsampleUBO: UniformBlock = lg.getUniformBlock(SetIndex.MATERIAL, - 0, 'BloomUBO', bloomDownsampleUniformBlock); - lg.setUniform(bloomDownsampleUBO, 'texSize', Type.FLOAT4, 1); - lg.setDescriptor(bloomDownsampleUniformBlock, 'BloomUBO', Type.UNKNOWN); - - const bloomDownsamplePassBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, - ParameterType.TABLE, - DescriptorTypeOrder.SAMPLER_TEXTURE, - ShaderStageFlagBit.FRAGMENT, - bloomDownsampleDescriptors); - lg.setDescriptor(bloomDownsamplePassBlock, 'bloomTexture', Type.SAMPLER2D); - lg.merge(bloomDownsampleDescriptors); - lg.mergeDescriptors(bloomDownsampleID); + buildBloomDownSample(lg, 0); + buildBloomDownSample(lg, 1); // 3.=== Bloom upsample === - const bloomUpsampleID = lg.addRenderStage('Bloom_Upsample', BloomStage.UPSAMPLE); - lg.addRenderPhase('Queue', bloomUpsampleID); - const bloomUpsampleDescriptors = lg.layoutGraph.getDescriptors(bloomUpsampleID); - - const bloomUpsampleUniformBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, - ParameterType.TABLE, - DescriptorTypeOrder.UNIFORM_BUFFER, - ShaderStageFlagBit.ALL, - bloomUpsampleDescriptors); - const bloomUpsampleUBO: UniformBlock = lg.getUniformBlock(SetIndex.MATERIAL, - 0, 'BloomUBO', bloomUpsampleUniformBlock); - lg.setUniform(bloomUpsampleUBO, 'texSize', Type.FLOAT4, 1); - lg.setDescriptor(bloomUpsampleUniformBlock, 'BloomUBO', Type.UNKNOWN); - - const bloomUpsamplePassBlock = lg.getLayoutBlock(UpdateFrequency.PER_PASS, - ParameterType.TABLE, - DescriptorTypeOrder.SAMPLER_TEXTURE, - ShaderStageFlagBit.FRAGMENT, - bloomUpsampleDescriptors); - lg.setDescriptor(bloomUpsamplePassBlock, 'bloomTexture', Type.SAMPLER2D); - lg.merge(bloomUpsampleDescriptors); - lg.mergeDescriptors(bloomUpsampleID); + buildBloomUpSample(lg, 0); + buildBloomUpSample(lg, 1); // 4.=== Bloom combine === const bloomCombineSampleID = lg.addRenderStage('Bloom_Combine', BloomStage.COMBINE); lg.addRenderPhase('Queue', bloomCombineSampleID); diff --git a/cocos/rendering/custom/executor.ts b/cocos/rendering/custom/executor.ts index 1da43f1023..c451a3cd56 100644 --- a/cocos/rendering/custom/executor.ts +++ b/cocos/rendering/custom/executor.ts @@ -1217,6 +1217,7 @@ class DeviceSceneTask extends WebSceneTask { const blit = this.graphScene.blit; const currMat = blit.material; const pass = currMat!.passes[blit.passID]; + pass.update(); const shader = pass.getShaderVariant(); const devicePass = this._currentQueue.devicePass; this._beginBindBlitUbo(devicePass);