diff --git a/cocos/rendering/custom/define.ts b/cocos/rendering/custom/define.ts index 1bccbb06c5..9df57dfe3b 100644 --- a/cocos/rendering/custom/define.ts +++ b/cocos/rendering/custom/define.ts @@ -52,11 +52,11 @@ export enum AntiAliasing { FXAAHQ, } -function GetRTFormatBeforeToneMapping (ppl: BasicPipeline) { +function getRTFormatBeforeToneMapping (ppl: BasicPipeline) { const useFloatOutput = ppl.getMacroBool('CC_USE_FLOAT_OUTPUT'); return ppl.pipelineSceneData.isHDR && useFloatOutput && supportsRGBA16FloatTexture(ppl.device) ? Format.RGBA16F : Format.RGBA8; } -function ForceEnableFloatOutput (ppl: BasicPipeline) { +function forceEnableFloatOutput (ppl: BasicPipeline) { if (ppl.pipelineSceneData.isHDR && !ppl.getMacroBool('CC_USE_FLOAT_OUTPUT')) { const supportFloatOutput = supportsRGBA16FloatTexture(ppl.device); ppl.setMacroBool('CC_USE_FLOAT_OUTPUT', supportFloatOutput); @@ -539,7 +539,7 @@ export function buildForwardPass (camera: Camera, if (!isOffScreen) { ppl.addRenderWindow(forwardPassRTName, Format.BGRA8, width, height, camera.window); } else { - ppl.addRenderTarget(forwardPassRTName, GetRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.PERSISTENT); + ppl.addRenderTarget(forwardPassRTName, getRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.PERSISTENT); } ppl.addDepthStencil(forwardPassDSName, Format.DEPTH_STENCIL, width, height, ResourceResidency.MANAGED); } @@ -1459,7 +1459,7 @@ function _buildSSSSBlurPass (camera: Camera, const ssssBlurRTName = `dsSSSSBlurColor${cameraName}`; const ssssBlurDSName = `dsSSSSBlurDSColor${cameraName}`; if (!ppl.containsResource(ssssBlurRTName)) { - ppl.addRenderTarget(ssssBlurRTName, GetRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.MANAGED); + ppl.addRenderTarget(ssssBlurRTName, getRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.MANAGED); ppl.addRenderTarget(ssssBlurDSName, Format.RGBA8, width, height, ResourceResidency.MANAGED); } ppl.updateRenderTarget(ssssBlurRTName, width, height); @@ -1782,7 +1782,7 @@ export function buildSSSSPass (camera: Camera, inputRT: string, inputDS: string) { if (hasSkinObject(ppl)) { - ForceEnableFloatOutput(ppl); + forceEnableFloatOutput(ppl); const blurInfo = _buildSSSSBlurPass(camera, ppl, inputRT, inputDS); const specularInfo = _buildSpecularPass(camera, ppl, blurInfo.rtName, blurInfo.dsName); return { rtName: specularInfo.rtName, dsName: specularInfo.dsName }; @@ -2079,7 +2079,7 @@ function _buildHBAOCombinedPass (camera: Camera, const outputRTName = outputRT; if (!ppl.containsResource(outputRTName)) { - ppl.addRenderTarget(outputRTName, GetRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.MANAGED); + ppl.addRenderTarget(outputRTName, getRTFormatBeforeToneMapping(ppl), width, height, ResourceResidency.MANAGED); } ppl.updateRenderTarget(outputRTName, width, height); const hbaoPass = ppl.addRenderPass(width, height, 'combine-pass'); diff --git a/cocos/rendering/post-process/passes/base-pass.ts b/cocos/rendering/post-process/passes/base-pass.ts index a71e4d4964..c9b886a1a2 100644 --- a/cocos/rendering/post-process/passes/base-pass.ts +++ b/cocos/rendering/post-process/passes/base-pass.ts @@ -7,15 +7,15 @@ import { BasicPipeline, Pipeline } from '../../custom/pipeline'; import { passContext } from '../utils/pass-context'; import { Format } from '../../../gfx'; import { supportsRGBA16FloatTexture } from '../../define'; -import { macro } from '../../../core'; +import { cclegacy, macro } from '../../../core'; let _BasePassID = 0; -export function GetRTFormatBeforeToneMapping (ppl: BasicPipeline) { +export function getRTFormatBeforeToneMapping (ppl: BasicPipeline) { const useFloatOutput = ppl.getMacroBool('CC_USE_FLOAT_OUTPUT'); return ppl.pipelineSceneData.isHDR && useFloatOutput && supportsRGBA16FloatTexture(ppl.device) ? Format.RGBA16F : Format.RGBA8; } -export function ForceEnableFloatOutput (ppl: BasicPipeline) { +export function forceEnableFloatOutput (ppl: BasicPipeline) { if (ppl.pipelineSceneData.isHDR && !ppl.getMacroBool('CC_USE_FLOAT_OUTPUT')) { const supportFloatOutput = supportsRGBA16FloatTexture(ppl.device); ppl.setMacroBool('CC_USE_FLOAT_OUTPUT', supportFloatOutput); @@ -23,6 +23,11 @@ export function ForceEnableFloatOutput (ppl: BasicPipeline) { } } +export function disablePostProcessForDebugView () { + const debugView = cclegacy.director.root.debugView; + return debugView.singleMode as number > 0; +} + export abstract class BasePass { abstract name: string; effectName = 'pipeline/post-process/blit-screen'; diff --git a/cocos/rendering/post-process/passes/bloom-pass.ts b/cocos/rendering/post-process/passes/bloom-pass.ts index 1b4ce8f3ea..c47ad40983 100644 --- a/cocos/rendering/post-process/passes/bloom-pass.ts +++ b/cocos/rendering/post-process/passes/bloom-pass.ts @@ -7,6 +7,7 @@ import { passContext } from '../utils/pass-context'; import { getSetting, SettingPass } from './setting-pass'; import { Bloom } from '../components'; +import { disablePostProcessForDebugView } from './base-pass'; const MAX_BLOOM_FILTER_PASS_NUM = 6; const BLOOM_DOWNSAMPLEPASS_INDEX = 1; @@ -15,6 +16,14 @@ const BLOOM_COMBINEPASS_INDEX = BLOOM_UPSAMPLEPASS_INDEX + MAX_BLOOM_FILTER_PASS export class BloomPass extends SettingPass { get setting () { return getSetting(Bloom); } + checkEnable (camera: Camera) { + let enable = super.checkEnable(camera); + if (disablePostProcessForDebugView()) { + enable = false; + } + return enable; + } + name = 'BloomPass' effectName = 'pipeline/post-process/bloom'; outputNames = ['BloomColor'] diff --git a/cocos/rendering/post-process/passes/color-grading-pass.ts b/cocos/rendering/post-process/passes/color-grading-pass.ts index 62d988210d..fa42412a1c 100644 --- a/cocos/rendering/post-process/passes/color-grading-pass.ts +++ b/cocos/rendering/post-process/passes/color-grading-pass.ts @@ -7,10 +7,19 @@ import { passContext } from '../utils/pass-context'; import { getSetting, SettingPass } from './setting-pass'; import { ColorGrading } from '../components'; +import { disablePostProcessForDebugView } from './base-pass'; export class ColorGradingPass extends SettingPass { get setting () { return getSetting(ColorGrading); } + checkEnable (camera: Camera) { + let enable = super.checkEnable(camera); + if (disablePostProcessForDebugView()) { + enable = false; + } + return enable; + } + name = 'ColorGradingPass' effectName = 'pipeline/post-process/color-grading'; outputNames = ['ColorGrading'] diff --git a/cocos/rendering/post-process/passes/forward-pass.ts b/cocos/rendering/post-process/passes/forward-pass.ts index 55aa1d9fa9..a6def0cf7b 100644 --- a/cocos/rendering/post-process/passes/forward-pass.ts +++ b/cocos/rendering/post-process/passes/forward-pass.ts @@ -8,7 +8,7 @@ import { AccessType, LightInfo, QueueHint, ResourceResidency, SceneFlags } from import { getCameraUniqueID } from '../../custom/define'; import { Pipeline } from '../../custom/pipeline'; import { passContext } from '../utils/pass-context'; -import { BasePass, GetRTFormatBeforeToneMapping } from './base-pass'; +import { BasePass, getRTFormatBeforeToneMapping } from './base-pass'; import { ShadowPass } from './shadow-pass'; export class ForwardPass extends BasePass { @@ -53,7 +53,7 @@ export class ForwardPass extends BasePass { passContext .updatePassViewPort() .addRenderPass('default', `${this.name}_${cameraID}`) - .addRasterView(slot0, GetRTFormatBeforeToneMapping(ppl), isOffScreen) + .addRasterView(slot0, getRTFormatBeforeToneMapping(ppl), isOffScreen) .addRasterView(slot1, Format.DEPTH_STENCIL, isOffScreen) .version(); diff --git a/cocos/rendering/post-process/passes/forward-transparency-pass.ts b/cocos/rendering/post-process/passes/forward-transparency-pass.ts index 8445003e3e..64c4e37591 100644 --- a/cocos/rendering/post-process/passes/forward-transparency-pass.ts +++ b/cocos/rendering/post-process/passes/forward-transparency-pass.ts @@ -28,7 +28,7 @@ import { LightInfo, QueueHint, SceneFlags } from '../../custom'; import { getCameraUniqueID } from '../../custom/define'; import { Pipeline } from '../../custom/pipeline'; import { passContext } from '../utils/pass-context'; -import { BasePass, GetRTFormatBeforeToneMapping } from './base-pass'; +import { BasePass, getRTFormatBeforeToneMapping } from './base-pass'; import { ShadowPass } from './shadow-pass'; export class ForwardTransparencyPass extends BasePass { @@ -52,7 +52,7 @@ export class ForwardTransparencyPass extends BasePass { passContext .updatePassViewPort() .addRenderPass('default', `${this.name}_${cameraID}`) - .addRasterView(output, GetRTFormatBeforeToneMapping(ppl), isOffScreen) + .addRasterView(output, getRTFormatBeforeToneMapping(ppl), isOffScreen) .addRasterView(outputDS, Format.DEPTH_STENCIL, isOffScreen) .version(); diff --git a/cocos/rendering/post-process/passes/skin-pass.ts b/cocos/rendering/post-process/passes/skin-pass.ts index 48140d0ac5..8fcd1756e0 100644 --- a/cocos/rendering/post-process/passes/skin-pass.ts +++ b/cocos/rendering/post-process/passes/skin-pass.ts @@ -32,7 +32,7 @@ import { MeshRenderer } from '../../../3d'; import { ShadowPass } from './shadow-pass'; import { SettingPass } from './setting-pass'; -import { ForceEnableFloatOutput, GetRTFormatBeforeToneMapping } from './base-pass'; +import { forceEnableFloatOutput, getRTFormatBeforeToneMapping } from './base-pass'; export const COPY_INPUT_DS_PASS_INDEX = 0; export const SSSS_BLUR_X_PASS_INDEX = 1; @@ -197,7 +197,7 @@ export class SkinPass extends SettingPass { const inputRT = this.lastPass?.slotName(camera, 0); const inputDS = this.lastPass?.slotName(camera, 1); if (hasSkinObject(ppl)) { - ForceEnableFloatOutput(ppl); + forceEnableFloatOutput(ppl); const blurInfo = this._buildSSSSBlurPass(camera, ppl, inputRT!, inputDS!); this._buildSpecularPass(camera, ppl, blurInfo.rtName, blurInfo.dsName); } else { @@ -248,7 +248,7 @@ export class SkinPass extends SettingPass { .setPassInput(ssssBlurDSName, 'depthTex') .setClearFlag(ClearFlagBit.COLOR) .setClearColor(0, 0, 0, 1) - .addRasterView(ssssBlurRTName, GetRTFormatBeforeToneMapping(ppl)) + .addRasterView(ssssBlurRTName, getRTFormatBeforeToneMapping(ppl)) .setClearFlag(ClearFlagBit.NONE) .setClearDepthColor(camera.clearDepth, camera.clearStencil, 0, 0) .addRasterView(inputDS, Format.DEPTH_STENCIL) @@ -268,7 +268,7 @@ export class SkinPass extends SettingPass { .setPassInput(ssssBlurDSName, 'depthTex') .setClearFlag(ClearFlagBit.NONE) .setClearColor(0, 0, 0, 1) - .addRasterView(inputRT, GetRTFormatBeforeToneMapping(ppl)) + .addRasterView(inputRT, getRTFormatBeforeToneMapping(ppl)) .setClearFlag(ClearFlagBit.NONE) .setClearDepthColor(camera.clearDepth, camera.clearStencil, 0, 0) .addRasterView(inputDS, Format.DEPTH_STENCIL) @@ -289,7 +289,7 @@ export class SkinPass extends SettingPass { .addRenderPass(layoutName, passName) .setClearFlag(ClearFlagBit.NONE) .setClearColor(0, 0, 0, 1) - .addRasterView(inputRT, GetRTFormatBeforeToneMapping(ppl), true) + .addRasterView(inputRT, getRTFormatBeforeToneMapping(ppl), true) .setClearFlag(ClearFlagBit.NONE) .setClearDepthColor(camera.clearDepth, camera.clearStencil, 0, 1) .addRasterView(inputDS, Format.DEPTH_STENCIL, true) diff --git a/cocos/rendering/post-process/passes/taa-pass.ts b/cocos/rendering/post-process/passes/taa-pass.ts index b25ed91222..0b9451fd66 100644 --- a/cocos/rendering/post-process/passes/taa-pass.ts +++ b/cocos/rendering/post-process/passes/taa-pass.ts @@ -7,6 +7,7 @@ import { Pipeline, ResourceResidency } from '../../custom'; import { getCameraUniqueID } from '../../custom/define'; import { TAA } from '../components/taa'; import { passContext } from '../utils/pass-context'; +import { disablePostProcessForDebugView } from './base-pass'; import { getSetting, SettingPass } from './setting-pass'; const tempVec4 = new Vec4(); @@ -98,6 +99,9 @@ export class TAAPass extends SettingPass { if (EDITOR && camera.cameraUsage === CameraUsage.PREVIEW) { enable = false; } + if (disablePostProcessForDebugView()) { + enable = false; + } return enable; } @@ -146,10 +150,6 @@ export class TAAPass extends SettingPass { firstRender = true; public render (camera: Camera, ppl: Pipeline): void { - if (!this.checkEnable(camera)) { - return; - } - const cameraID = getCameraUniqueID(camera); passContext.clearFlag = ClearFlagBit.COLOR; diff --git a/editor/assets/effects/pipeline/post-process/fxaa-hq.effect b/editor/assets/effects/pipeline/post-process/fxaa-hq.effect index e31c1b752d..3f894f98fc 100644 --- a/editor/assets/effects/pipeline/post-process/fxaa-hq.effect +++ b/editor/assets/effects/pipeline/post-process/fxaa-hq.effect @@ -3,7 +3,7 @@ CCEffect %{ techniques: - name: fxaa passes: - - vert: fxaa-vs:vert + - vert: fxaa-vs frag: fxaa-edge-fs:frag pass: fxaa depthStencilState: @@ -14,18 +14,7 @@ CCEffect %{ }% CCProgram fxaa-vs %{ - precision highp float; - #include - - in vec2 a_position; - in vec2 a_texCoord; - out vec2 v_uv; - - vec4 vert () { - vec4 pos = vec4(a_position, 0.0, 1.0); - v_uv = a_texCoord; - return pos; - } + #include <./chunks/vs> }% CCProgram fxaa-edge-fs %{ diff --git a/editor/assets/effects/pipeline/post-process/hbao.effect b/editor/assets/effects/pipeline/post-process/hbao.effect index eed225d204..adff7297dd 100644 --- a/editor/assets/effects/pipeline/post-process/hbao.effect +++ b/editor/assets/effects/pipeline/post-process/hbao.effect @@ -44,21 +44,7 @@ CCEffect %{ }% CCProgram hbao-vs %{ - precision highp float; - #include - #include - #include - - out vec2 v_uv; - - void main () { - StandardVertInput In; - CCDecode(In); - CC_HANDLE_GET_CLIP_FLIP(In.position.xy); - gl_Position = In.position; - gl_Position.y = gl_Position.y; - v_uv = a_texCoord; - } + #include <./chunks/vs> }% CCProgram hbao-fs %{ diff --git a/editor/assets/effects/pipeline/ssss-blur.effect b/editor/assets/effects/pipeline/ssss-blur.effect index fd08557f9c..b192d9a9dc 100644 --- a/editor/assets/effects/pipeline/ssss-blur.effect +++ b/editor/assets/effects/pipeline/ssss-blur.effect @@ -29,21 +29,7 @@ CCEffect %{ }% CCProgram blur-vs %{ - precision highp float; - #include - #include - #include - - out vec2 v_uv; - - void main () { - StandardVertInput In; - CCVertInput(In); - CC_HANDLE_GET_CLIP_FLIP(In.position.xy); - gl_Position = In.position; - gl_Position.y = gl_Position.y; - v_uv = a_texCoord; - } + #include <./post-process/chunks/vs> }% CCProgram copy-fs %{ diff --git a/editor/assets/effects/pipeline/tone-mapping.effect b/editor/assets/effects/pipeline/tone-mapping.effect index f04701cb87..d280e6b52d 100644 --- a/editor/assets/effects/pipeline/tone-mapping.effect +++ b/editor/assets/effects/pipeline/tone-mapping.effect @@ -14,21 +14,7 @@ CCEffect %{ }% CCProgram tonemap-vs %{ - precision highp float; - #include - #include - #include - - out vec2 v_uv; - - void main () { - StandardVertInput In; - CCDecode(In); - CC_HANDLE_GET_CLIP_FLIP(In.position.xy); - gl_Position = In.position; - gl_Position.y = gl_Position.y; - v_uv = a_texCoord; - } + #include <./post-process/chunks/vs> }% CCProgram tonemap-fs %{