From 0aa37fcd22bb6ff96132b4876be18e7acd9d3f30 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Thu, 7 Nov 2024 14:00:32 +0800
Subject: [PATCH 1/7] update builtin types

---
 .../builtin-pipeline-types.ts                     | 15 +++++++++------
 .../effects/pipeline/post-process/dof1.effect     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/editor/assets/default_renderpipeline/builtin-pipeline-types.ts b/editor/assets/default_renderpipeline/builtin-pipeline-types.ts
index 9301cb4432e..acfcb4724a3 100644
--- a/editor/assets/default_renderpipeline/builtin-pipeline-types.ts
+++ b/editor/assets/default_renderpipeline/builtin-pipeline-types.ts
@@ -28,7 +28,7 @@
  * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
  */
 /* eslint-disable max-len */
-import { Material, Texture2D, gfx, Vec3 } from 'cc';
+import { Material, Texture2D, Vec3, gfx } from 'cc';
 
 const { SampleCount } = gfx;
 
@@ -100,9 +100,9 @@ export interface DepthOfField {
     enabled: boolean; /* false */
     /* refcount */ material: Material | null;
     minRange: number; /* 0 */
-    maxRange: number; /* 0 */
+    maxRange: number; /* 50 */
     blurRadius: number; /* 1 */
-    intensity: number;
+    intensity: number; /* 1 */
     focusPos: Vec3;
     [name: string]: unknown;
 }
@@ -114,7 +114,7 @@ export function makeDepthOfField(): DepthOfField {
         minRange: 0,
         maxRange: 50,
         blurRadius: 1,
-        intensity: 0.2,
+        intensity: 1,
         focusPos: new Vec3(0, 0, 0),
     };
 }
@@ -130,13 +130,16 @@ export function fillRequiredDepthOfField(value: DepthOfField): void {
         value.minRange = 0;
     }
     if (value.maxRange === undefined) {
-        value.maxRange = 0;
+        value.maxRange = 50;
     }
     if (value.blurRadius === undefined) {
         value.blurRadius = 1;
     }
+    if (value.intensity === undefined) {
+        value.intensity = 1;
+    }
     if (value.focusPos === undefined) {
-        value.focusPos = new Vec3();
+        value.focusPos = new Vec3(0, 0, 0);
     }
 }
 
diff --git a/editor/assets/effects/pipeline/post-process/dof1.effect b/editor/assets/effects/pipeline/post-process/dof1.effect
index 6ca5c5bc40f..f69b89b5e89 100644
--- a/editor/assets/effects/pipeline/post-process/dof1.effect
+++ b/editor/assets/effects/pipeline/post-process/dof1.effect
@@ -61,7 +61,7 @@ void main() {
   outColor += blur(screenTex, v_uv + offsets.zy);
   outColor += blur(screenTex, v_uv + offsets.xw);
   outColor += blur(screenTex, v_uv + offsets.zw);
-  fragColor = outColor * blurParams.w;
+  fragColor = outColor * blurParams.w * 0.25;
 }
 }%
 

From f45a20766cfcbed5f4662ada44ed4ff5600680e9 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Thu, 7 Nov 2024 19:04:04 +0800
Subject: [PATCH 2/7] adding pipeline pass builder

---
 cocos/rendering/custom/framework.ts           | 23 +++++++++++++++-
 cocos/rendering/custom/pipeline.ts            | 26 +++++++++++++++++++
 .../pipeline/custom/RenderInterfaceFwd.h      |  1 +
 .../pipeline/custom/RenderInterfaceTypes.h    | 15 +++++++++++
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/cocos/rendering/custom/framework.ts b/cocos/rendering/custom/framework.ts
index f0ecdf0d87a..9f0e72b69a5 100644
--- a/cocos/rendering/custom/framework.ts
+++ b/cocos/rendering/custom/framework.ts
@@ -22,11 +22,12 @@
  THE SOFTWARE.
 */
 
-import { BasicPipeline, PipelineBuilder } from './pipeline';
+import { BasicPipeline, PipelineBuilder, PipelinePassBuilder } from './pipeline';
 import { Camera } from '../../render-scene/scene/camera';
 import { RenderWindow } from '../../render-scene/core/render-window';
 import { supportsR32FloatTexture } from '../define';
 import { Format } from '../../gfx/base/define';
+import { cclegacy, macro } from '../../core';
 
 export { packRGBE } from '../../core/math/color';
 
@@ -102,3 +103,23 @@ export function dispatchResizeEvents (cameras: Camera[], builder: PipelineBuilde
     // For editor preview
     forceResize = false;
 }
+
+let sBuilder: PipelineBuilder;
+
+export function addPipelinePassBuilder (camera: Camera, passBuilder: PipelinePassBuilder): void {
+    if (!sBuilder) {
+        sBuilder = cclegacy.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME);
+    }
+    if (sBuilder.addPipelinePassBuilder) {
+        sBuilder.addPipelinePassBuilder(camera, passBuilder);
+    }
+}
+
+export function removePipelinePassBuilder (camera: Camera, passBuilder: PipelinePassBuilder): void {
+    if (!sBuilder) {
+        sBuilder = cclegacy.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME);
+    }
+    if (sBuilder.removePipelinePassBuilder) {
+        sBuilder.removePipelinePassBuilder(camera, passBuilder);
+    }
+}
diff --git a/cocos/rendering/custom/pipeline.ts b/cocos/rendering/custom/pipeline.ts
index 51796b74c02..6917fefcaa5 100644
--- a/cocos/rendering/custom/pipeline.ts
+++ b/cocos/rendering/custom/pipeline.ts
@@ -1657,6 +1657,30 @@ export interface Pipeline extends BasicPipeline {
         type: string): number;
 }
 
+export interface PipelinePassBuilder {
+    getConfigOrder (): number;
+    getRenderOrder (): number;
+    configCamera? (
+        camera: Readonly<Camera>,
+        pplConfigs: { readonly [name: string]: any },
+        cameraConfigs: { [name: string]: any }): void;
+    windowResize? (
+        ppl: BasicPipeline,
+        pplConfigs: { readonly [name: string]: any },
+        cameraConfigs: { readonly [name: string]: any },
+        window: RenderWindow,
+        camera: Camera,
+        width: number,
+        height: number): void;
+    setup? (
+        ppl: BasicPipeline,
+        pplConfigs: { readonly [name: string]: any },
+        cameraConfigs: { readonly [name: string]: any },
+        camera: Camera,
+        context: { [name: string]: any },
+        prevRenderPass?: BasicRenderPassBuilder): BasicRenderPassBuilder | undefined;
+}
+
 /**
  * @en Pipeline builder.
  * User can implement this interface and setup render graph.
@@ -1684,6 +1708,8 @@ export interface PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     onGlobalPipelineStateChanged? (): void;
+    addPipelinePassBuilder? (camera: Camera, passBuilder: PipelinePassBuilder): void;
+    removePipelinePassBuilder? (camera: Camera, passBuilder: PipelinePassBuilder): void;
 }
 
 /**
diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceFwd.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceFwd.h
index 87b4f18dd20..c46e1964184 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceFwd.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceFwd.h
@@ -58,6 +58,7 @@ class RenderPassBuilder;
 class MultisampleRenderPassBuilder;
 class ComputePassBuilder;
 class Pipeline;
+class PipelinePassBuilder;
 class PipelineBuilder;
 class RenderingModule;
 class Factory;
diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
index cc9a686d9bc..5d6a1b2cc7d 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
@@ -1744,6 +1744,19 @@ class Pipeline : public BasicPipeline {
     }
 };
 
+class PipelinePassBuilder {
+public:
+    PipelinePassBuilder() noexcept = default;
+    PipelinePassBuilder(PipelinePassBuilder&& rhs) = delete;
+    PipelinePassBuilder(PipelinePassBuilder const& rhs) = delete;
+    PipelinePassBuilder& operator=(PipelinePassBuilder&& rhs) = delete;
+    PipelinePassBuilder& operator=(PipelinePassBuilder const& rhs) = delete;
+    virtual ~PipelinePassBuilder() noexcept = default;
+
+    virtual uint32_t getConfigOrder() const = 0;
+    virtual uint32_t getRenderOrder() const = 0;
+};
+
 /**
  * @en Pipeline builder.
  * User can implement this interface and setup render graph.
@@ -1774,6 +1787,8 @@ class PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     virtual void onGlobalPipelineStateChanged() = 0;
+    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
+    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
 };
 
 /**

From 5c055525f0fa6796d09f736015c95beeca3259c5 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Thu, 7 Nov 2024 23:35:01 +0800
Subject: [PATCH 3/7] fix native matViewInv

---
 cocos/render-scene/scene/camera.jsb.ts                 | 10 ++++++++++
 native/cocos/bindings/manual/jsb_scene_manual.cpp      |  1 +
 .../renderer/pipeline/custom/RenderInterfaceTypes.h    |  4 ++--
 native/cocos/scene/Camera.cpp                          |  1 +
 native/cocos/scene/Camera.h                            |  2 ++
 native/tools/swig-config/scene.i                       |  1 +
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cocos/render-scene/scene/camera.jsb.ts b/cocos/render-scene/scene/camera.jsb.ts
index e7ac4a39b84..5d8fa55b3a8 100644
--- a/cocos/render-scene/scene/camera.jsb.ts
+++ b/cocos/render-scene/scene/camera.jsb.ts
@@ -163,6 +163,16 @@ Object.defineProperty(cameraProto, 'matView', {
     }
 });
 
+Object.defineProperty(cameraProto, 'matViewInv', {
+    configurable: true,
+    enumerable: true,
+    get () {
+        this.getMatViewInv();
+        fillMat4WithTempFloatArray(this._matViewInv);
+        return this._matViewInv;
+    }
+});
+
 Object.defineProperty(cameraProto, 'matProj', {
     configurable: true,
     enumerable: true,
diff --git a/native/cocos/bindings/manual/jsb_scene_manual.cpp b/native/cocos/bindings/manual/jsb_scene_manual.cpp
index e421a81c0b1..1043a2a8894 100644
--- a/native/cocos/bindings/manual/jsb_scene_manual.cpp
+++ b/native/cocos/bindings/manual/jsb_scene_manual.cpp
@@ -523,6 +523,7 @@ FAST_GET_CONST_REF(cc, Node, getWorldMatrix, Mat4)
 FAST_GET_CONST_REF(cc, Node, getEulerAngles, Vec3)
 
 FAST_GET_CONST_REF(cc::scene, Camera, getMatView, Mat4)
+FAST_GET_CONST_REF(cc::scene, Camera, getMatViewInv, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatProj, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatProjInv, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatViewProj, Mat4)
diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
index 5d6a1b2cc7d..64f047e6924 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
@@ -1787,8 +1787,8 @@ class PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     virtual void onGlobalPipelineStateChanged() = 0;
-    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
-    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
+    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
+    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
 };
 
 /**
diff --git a/native/cocos/scene/Camera.cpp b/native/cocos/scene/Camera.cpp
index 272cde121ae..f720c9b1440 100644
--- a/native/cocos/scene/Camera.cpp
+++ b/native/cocos/scene/Camera.cpp
@@ -172,6 +172,7 @@ void Camera::update(bool forceUpdate /*false*/) {
         scaleMat.scale(_node->getWorldScale());
         // remove scale
         Mat4::multiply(scaleMat, _matView, &_matView);
+        _matViewInv = _matView.getInversed();
         _position.set(_node->getWorldPosition());
         viewProjDirty = true;
     }
diff --git a/native/cocos/scene/Camera.h b/native/cocos/scene/Camera.h
index 2e2ebfbe627..fb99492ed73 100644
--- a/native/cocos/scene/Camera.h
+++ b/native/cocos/scene/Camera.h
@@ -265,6 +265,7 @@ class Camera : public RefCounted {
     inline uint32_t getHeight() const { return _height; }
     inline float getAspect() const { return _aspect; }
     inline const Mat4 &getMatView() const { return _matView; }
+    inline const Mat4 &getMatViewInv() const { return _matViewInv; }
     inline const Mat4 &getMatProj() const { return _matProj; }
     inline const Mat4 &getMatProjInv() const { return _matProjInv; }
     inline const Mat4 &getMatViewProj() const { return _matViewProj; }
@@ -396,6 +397,7 @@ class Camera : public RefCounted {
     gfx::SurfaceTransform _curTransform{gfx::SurfaceTransform::IDENTITY};
     bool _isProjDirty{true};
     Mat4 _matView;
+    Mat4 _matViewInv;
     Mat4 _matProj;
     Mat4 _matProjInv;
     Mat4 _matViewProj;
diff --git a/native/tools/swig-config/scene.i b/native/tools/swig-config/scene.i
index a6acf1cc998..e00497b38d3 100644
--- a/native/tools/swig-config/scene.i
+++ b/native/tools/swig-config/scene.i
@@ -176,6 +176,7 @@ using namespace cc;
 %ignore cc::scene::Camera::worldToScreen;
 %ignore cc::scene::Camera::worldMatrixToScreen;
 %ignore cc::scene::Camera::getMatView;
+%ignore cc::scene::Camera::getMatViewInv;
 %ignore cc::scene::Camera::getMatProj;
 %ignore cc::scene::Camera::getMatProjInv;
 %ignore cc::scene::Camera::getMatViewProj;

From 6e0b428c53b5ee0df37bc1d093ca05f8ec086cf2 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Thu, 7 Nov 2024 23:42:31 +0800
Subject: [PATCH 4/7] Revert "fix native matViewInv"

This reverts commit 5c055525f0fa6796d09f736015c95beeca3259c5.
---
 cocos/render-scene/scene/camera.jsb.ts                 | 10 ----------
 native/cocos/bindings/manual/jsb_scene_manual.cpp      |  1 -
 .../renderer/pipeline/custom/RenderInterfaceTypes.h    |  4 ++--
 native/cocos/scene/Camera.cpp                          |  1 -
 native/cocos/scene/Camera.h                            |  2 --
 native/tools/swig-config/scene.i                       |  1 -
 6 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/cocos/render-scene/scene/camera.jsb.ts b/cocos/render-scene/scene/camera.jsb.ts
index 5d8fa55b3a8..e7ac4a39b84 100644
--- a/cocos/render-scene/scene/camera.jsb.ts
+++ b/cocos/render-scene/scene/camera.jsb.ts
@@ -163,16 +163,6 @@ Object.defineProperty(cameraProto, 'matView', {
     }
 });
 
-Object.defineProperty(cameraProto, 'matViewInv', {
-    configurable: true,
-    enumerable: true,
-    get () {
-        this.getMatViewInv();
-        fillMat4WithTempFloatArray(this._matViewInv);
-        return this._matViewInv;
-    }
-});
-
 Object.defineProperty(cameraProto, 'matProj', {
     configurable: true,
     enumerable: true,
diff --git a/native/cocos/bindings/manual/jsb_scene_manual.cpp b/native/cocos/bindings/manual/jsb_scene_manual.cpp
index 1043a2a8894..e421a81c0b1 100644
--- a/native/cocos/bindings/manual/jsb_scene_manual.cpp
+++ b/native/cocos/bindings/manual/jsb_scene_manual.cpp
@@ -523,7 +523,6 @@ FAST_GET_CONST_REF(cc, Node, getWorldMatrix, Mat4)
 FAST_GET_CONST_REF(cc, Node, getEulerAngles, Vec3)
 
 FAST_GET_CONST_REF(cc::scene, Camera, getMatView, Mat4)
-FAST_GET_CONST_REF(cc::scene, Camera, getMatViewInv, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatProj, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatProjInv, Mat4)
 FAST_GET_CONST_REF(cc::scene, Camera, getMatViewProj, Mat4)
diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
index 64f047e6924..5d6a1b2cc7d 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
@@ -1787,8 +1787,8 @@ class PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     virtual void onGlobalPipelineStateChanged() = 0;
-    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
-    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
+    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
+    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
 };
 
 /**
diff --git a/native/cocos/scene/Camera.cpp b/native/cocos/scene/Camera.cpp
index f720c9b1440..272cde121ae 100644
--- a/native/cocos/scene/Camera.cpp
+++ b/native/cocos/scene/Camera.cpp
@@ -172,7 +172,6 @@ void Camera::update(bool forceUpdate /*false*/) {
         scaleMat.scale(_node->getWorldScale());
         // remove scale
         Mat4::multiply(scaleMat, _matView, &_matView);
-        _matViewInv = _matView.getInversed();
         _position.set(_node->getWorldPosition());
         viewProjDirty = true;
     }
diff --git a/native/cocos/scene/Camera.h b/native/cocos/scene/Camera.h
index fb99492ed73..2e2ebfbe627 100644
--- a/native/cocos/scene/Camera.h
+++ b/native/cocos/scene/Camera.h
@@ -265,7 +265,6 @@ class Camera : public RefCounted {
     inline uint32_t getHeight() const { return _height; }
     inline float getAspect() const { return _aspect; }
     inline const Mat4 &getMatView() const { return _matView; }
-    inline const Mat4 &getMatViewInv() const { return _matViewInv; }
     inline const Mat4 &getMatProj() const { return _matProj; }
     inline const Mat4 &getMatProjInv() const { return _matProjInv; }
     inline const Mat4 &getMatViewProj() const { return _matViewProj; }
@@ -397,7 +396,6 @@ class Camera : public RefCounted {
     gfx::SurfaceTransform _curTransform{gfx::SurfaceTransform::IDENTITY};
     bool _isProjDirty{true};
     Mat4 _matView;
-    Mat4 _matViewInv;
     Mat4 _matProj;
     Mat4 _matProjInv;
     Mat4 _matViewProj;
diff --git a/native/tools/swig-config/scene.i b/native/tools/swig-config/scene.i
index e00497b38d3..a6acf1cc998 100644
--- a/native/tools/swig-config/scene.i
+++ b/native/tools/swig-config/scene.i
@@ -176,7 +176,6 @@ using namespace cc;
 %ignore cc::scene::Camera::worldToScreen;
 %ignore cc::scene::Camera::worldMatrixToScreen;
 %ignore cc::scene::Camera::getMatView;
-%ignore cc::scene::Camera::getMatViewInv;
 %ignore cc::scene::Camera::getMatProj;
 %ignore cc::scene::Camera::getMatProjInv;
 %ignore cc::scene::Camera::getMatViewProj;

From 5e0b04fd0a28f3eeaf31f10df82e307c105ec233 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Thu, 7 Nov 2024 23:46:59 +0800
Subject: [PATCH 5/7] fix jsb

---
 native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
index 5d6a1b2cc7d..64f047e6924 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
@@ -1787,8 +1787,8 @@ class PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     virtual void onGlobalPipelineStateChanged() = 0;
-    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
-    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder &passBuilder) = 0;
+    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
+    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
 };
 
 /**

From c54fe3f1b6abe3db8450ed189bd1e00393384a26 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Fri, 8 Nov 2024 15:16:26 +0800
Subject: [PATCH 6/7] remove add PassBuilder

---
 cocos/rendering/custom/framework.ts           | 21 -------------------
 cocos/rendering/custom/pipeline.ts            |  3 +--
 .../pipeline/custom/RenderInterfaceTypes.h    |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/cocos/rendering/custom/framework.ts b/cocos/rendering/custom/framework.ts
index 9f0e72b69a5..15619fc8085 100644
--- a/cocos/rendering/custom/framework.ts
+++ b/cocos/rendering/custom/framework.ts
@@ -27,7 +27,6 @@ import { Camera } from '../../render-scene/scene/camera';
 import { RenderWindow } from '../../render-scene/core/render-window';
 import { supportsR32FloatTexture } from '../define';
 import { Format } from '../../gfx/base/define';
-import { cclegacy, macro } from '../../core';
 
 export { packRGBE } from '../../core/math/color';
 
@@ -103,23 +102,3 @@ export function dispatchResizeEvents (cameras: Camera[], builder: PipelineBuilde
     // For editor preview
     forceResize = false;
 }
-
-let sBuilder: PipelineBuilder;
-
-export function addPipelinePassBuilder (camera: Camera, passBuilder: PipelinePassBuilder): void {
-    if (!sBuilder) {
-        sBuilder = cclegacy.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME);
-    }
-    if (sBuilder.addPipelinePassBuilder) {
-        sBuilder.addPipelinePassBuilder(camera, passBuilder);
-    }
-}
-
-export function removePipelinePassBuilder (camera: Camera, passBuilder: PipelinePassBuilder): void {
-    if (!sBuilder) {
-        sBuilder = cclegacy.rendering.getCustomPipeline(macro.CUSTOM_PIPELINE_NAME);
-    }
-    if (sBuilder.removePipelinePassBuilder) {
-        sBuilder.removePipelinePassBuilder(camera, passBuilder);
-    }
-}
diff --git a/cocos/rendering/custom/pipeline.ts b/cocos/rendering/custom/pipeline.ts
index 6917fefcaa5..b2fb592896b 100644
--- a/cocos/rendering/custom/pipeline.ts
+++ b/cocos/rendering/custom/pipeline.ts
@@ -1660,6 +1660,7 @@ export interface Pipeline extends BasicPipeline {
 export interface PipelinePassBuilder {
     getConfigOrder (): number;
     getRenderOrder (): number;
+    resetCamera? (cameraConfigs: { [name: string]: any }): void;
     configCamera? (
         camera: Readonly<Camera>,
         pplConfigs: { readonly [name: string]: any },
@@ -1708,8 +1709,6 @@ export interface PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     onGlobalPipelineStateChanged? (): void;
-    addPipelinePassBuilder? (camera: Camera, passBuilder: PipelinePassBuilder): void;
-    removePipelinePassBuilder? (camera: Camera, passBuilder: PipelinePassBuilder): void;
 }
 
 /**
diff --git a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
index 64f047e6924..007593bf036 100644
--- a/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
+++ b/native/cocos/renderer/pipeline/custom/RenderInterfaceTypes.h
@@ -1787,8 +1787,6 @@ class PipelineBuilder {
      * @zh 渲染管线状态更新的回调
      */
     virtual void onGlobalPipelineStateChanged() = 0;
-    virtual void addPipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
-    virtual void removePipelinePassBuilder(scene::Camera *camera, PipelinePassBuilder *passBuilder) = 0;
 };
 
 /**

From 2c1c9c7796bfea91392a0816b8a4d8b959b14764 Mon Sep 17 00:00:00 2001
From: Zhou Zhenglong <zlzhou.sh@outlook.com>
Date: Fri, 8 Nov 2024 15:17:23 +0800
Subject: [PATCH 7/7] cleanup

---
 cocos/rendering/custom/framework.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cocos/rendering/custom/framework.ts b/cocos/rendering/custom/framework.ts
index 15619fc8085..f0ecdf0d87a 100644
--- a/cocos/rendering/custom/framework.ts
+++ b/cocos/rendering/custom/framework.ts
@@ -22,7 +22,7 @@
  THE SOFTWARE.
 */
 
-import { BasicPipeline, PipelineBuilder, PipelinePassBuilder } from './pipeline';
+import { BasicPipeline, PipelineBuilder } from './pipeline';
 import { Camera } from '../../render-scene/scene/camera';
 import { RenderWindow } from '../../render-scene/core/render-window';
 import { supportsR32FloatTexture } from '../define';