fix defferredForward pass lighting

hana-alice · Sep 4, 2023 · aff567f · aff567f
1 parent 4cc3a6f
commit aff567f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cocos/rendering/custom/builtin-pipelines.ts b/cocos/rendering/custom/builtin-pipelines.ts
@@ -106,7 +106,7 @@ export class DeferredPipelineBuilder implements PipelineBuilder {
                 // Lighting Pass
                 const lightInfo = setupLightingPass(ppl, info, useCluster);
                 // Deferred ForwardPass, for non-surface-shader material and transparent material
-                setupDeferredForward(ppl, info, lightInfo.rtName);
+                setupDeferredForward(ppl, info, lightInfo.rtName, useCluster);
                 // Postprocess
                 setupPostprocessPass(ppl, info, lightInfo.rtName);
 

diff --git a/cocos/rendering/custom/pipeline-define.ts b/cocos/rendering/custom/pipeline-define.ts
@@ -235,7 +235,7 @@ export function updateForwardRes (ppl: BasicPipeline, cameraInfo: CameraInfo, is
     ppl.updateDepthStencil(`ForwardDepthStencil${cameraInfo.id}`, width, height);
 }
 
-export function setupDeferredForward (ppl: BasicPipeline, cameraInfo: CameraInfo, inputColor: string): void {
+export function setupDeferredForward (ppl: BasicPipeline, cameraInfo: CameraInfo, inputColor: string, clusterLighting?: boolean): void {
     const area = getRenderArea(cameraInfo.camera, cameraInfo.camera.window.width, cameraInfo.camera.window.height);
     const width = area.width;
     const height = area.height;
@@ -255,10 +255,12 @@ export function setupDeferredForward (ppl: BasicPipeline, cameraInfo: CameraInfo
         }
     }
 
+    let sceneFlags = SceneFlags.OPAQUE_OBJECT | SceneFlags.PLANAR_SHADOW | SceneFlags.CUTOUT_OBJECT
+        | SceneFlags.DRAW_INSTANCING;
+    sceneFlags |= clusterLighting ? SceneFlags.CLUSTERED_LIGHTING : SceneFlags.DEFAULT_LIGHTING;
+
     forwardPass.addQueue(QueueHint.RENDER_OPAQUE, 'deferred-forward')
-        .addSceneOfCamera(camera, new LightInfo(),
-            SceneFlags.OPAQUE_OBJECT | SceneFlags.PLANAR_SHADOW | SceneFlags.CUTOUT_OBJECT
-            | SceneFlags.DEFAULT_LIGHTING | SceneFlags.DRAW_INSTANCING);
+        .addSceneOfCamera(camera, new LightInfo(), sceneFlags);
     forwardPass.addQueue(QueueHint.RENDER_TRANSPARENT, 'deferred-forward')
         .addSceneOfCamera(camera, new LightInfo(), SceneFlags.TRANSPARENT_OBJECT | SceneFlags.GEOMETRY);
 }