cluster lighting logic & pass set update (#16197)

cocos · Sep 8, 2023 · df2ce56 · df2ce56
1 parent 91ce03d
commit df2ce56
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 70 deletions.
diff --git a/cocos/render-scene/core/pass.ts b/cocos/render-scene/core/pass.ts
@@ -39,7 +39,7 @@ import {
     MacroRecord, MaterialProperty, customizeType, getBindingFromHandle, getDefaultFromType, getStringFromType,
     getOffsetFromHandle, getTypeFromHandle, type2reader, type2writer, getCountFromHandle, type2validator,
 } from './pass-utils';
-import { RenderPassStage, RenderPriority } from '../../rendering/define';
+import { RenderPassStage, RenderPriority, SetIndex } from '../../rendering/define';
 import { InstancedBuffer } from '../../rendering/instanced-buffer';
 import { ProgramLibrary } from '../../rendering/custom/private';
 
@@ -469,10 +469,19 @@ export class Pass {
      * @zh 重置所有 texture 和 sampler 为初始默认值。
      */
     public resetTextures (): void {
-        for (let i = 0; i < this._shaderInfo.samplerTextures.length; i++) {
-            const u = this._shaderInfo.samplerTextures[i];
-            for (let j = 0; j < u.count; j++) {
-                this.resetTexture(u.name, j);
+        if (cclegacy.rendering) {
+            const set = this._shaderInfo.descriptors[SetIndex.MATERIAL];
+            for (const combined of set.samplerTextures) {
+                for (let j = 0; j < combined.count; ++j) {
+                    this.resetTexture(combined.name, j);
+                }
+            }
+        } else {
+            for (let i = 0; i < this._shaderInfo.samplerTextures.length; i++) {
+                const u = this._shaderInfo.samplerTextures[i];
+                for (let j = 0; j < u.count; j++) {
+                    this.resetTexture(u.name, j);
+                }
             }
         }
     }

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);