V3.6.0 pipeline use3

cocos/2d/renderer/batcher-2d.ts

@@ -837,7 +837,10 @@ class DescriptorSetCache {
             if (this._descriptorSetCache.has(hash)) {
                 return this._descriptorSetCache.get(hash)!;
             } else {
-                _dsInfo.layout = batch.passes[0].localSetLayout;
+                const ly = batch.passes[0].localSetLayout;
+                if (ly) {
+                    _dsInfo.layout = ly;
+                }
                 const descriptorSet = root.device.createDescriptorSet(_dsInfo) as DescriptorSet;
                 const binding = ModelLocalBindings.SAMPLER_SPRITE;
                 descriptorSet.bindTexture(binding, batch.texture!);

cocos/core/pipeline/deferred/lighting-stage.ts

@@ -199,7 +199,10 @@ export class LightingStage extends RenderStage {
         const deferredLitsBufView = device.createBuffer(new BufferViewInfo(this._deferredLitsBufs, 0, totalSize));
         this._lightBufferData = new Float32Array(totalSize / Float32Array.BYTES_PER_ELEMENT);
 
-        this._descriptorSet = device.createDescriptorSet(new DescriptorSetInfo(pass.localSetLayout));
+        const ly = pass.localSetLayout;
+        if (ly) {
+            this._descriptorSet = device.createDescriptorSet(new DescriptorSetInfo(ly));
+        }
         this._descriptorSet.bindBuffer(UBOForwardLight.BINDING, deferredLitsBufView);
 
         const _localUBO = device.createBuffer(new BufferInfo(

cocos/core/pipeline/deferred/postprocess-stage.ts

@@ -135,7 +135,10 @@ export class PostProcessStage extends RenderStage {
         const renderObjects = pipeline.pipelineSceneData.renderObjects;
         if (pso != null && renderObjects.length > 0) {
             if (!this._stageDesc) {
-                this._stageDesc = device.createDescriptorSet(new DescriptorSetInfo(pass.localSetLayout));
+                const ly = pass.localSetLayout;
+                if (ly) {
+                    this._stageDesc = device.createDescriptorSet(new DescriptorSetInfo(ly));
+                }
                 this._localUBO = device.createBuffer(new BufferInfo(
                     BufferUsageBit.UNIFORM | BufferUsageBit.TRANSFER_DST,
                     MemoryUsageBit.DEVICE,

cocos/core/renderer/core/pass.ts

@@ -565,7 +565,10 @@ export class Pass {
         if (director.root.usesCustomPipeline) {
             const root = legacyCC.director.root;
             const ppl: Pipeline = root.customPipeline;
-            _dsInfo.layout = ppl.getDescriptorSetLayout(info.program, UpdateFrequency.PER_BATCH);
+            const ds = ppl.getDescriptorSetLayout(info.program, UpdateFrequency.PER_BATCH);
+            if (ds) {
+                _dsInfo.layout = ds;
+            } 
         } else {
             _dsInfo.layout = programLib.getDescriptorSetLayout(this._device, info.program);
         }
@@ -670,7 +673,7 @@ export class Pass {
     get root (): Root { return this._root; }
     get device (): Device { return this._device; }
     get shaderInfo (): IProgramInfo { return this._shaderInfo; }
-    get localSetLayout (): DescriptorSetLayout {
+    get localSetLayout (): DescriptorSetLayout | null {
         const director = legacyCC.director;
         if (director.root.usesCustomPipeline) {
             const root = legacyCC.director.root;

cocos/core/renderer/scene/submodel.ts

@@ -83,7 +83,10 @@ export class SubModel {
         // DS layout might change too
         if (this._descriptorSet) {
             this._descriptorSet.destroy();
-            _dsInfo.layout = passes[0].localSetLayout;
+            const ly = passes[0].localSetLayout;
+            if (ly) {
+                _dsInfo.layout = ly;
+            }
             this._descriptorSet = this._device!.createDescriptorSet(_dsInfo);
         }
     }
@@ -187,15 +190,21 @@ export class SubModel {
     public initialize (subMesh: RenderingSubMesh, passes: Pass[], patches: IMacroPatch[] | null = null): void {
         const root = legacyCC.director.root as Root;
         this._device = root.device;
-        _dsInfo.layout = passes[0].localSetLayout;
+        const ly =  passes[0].localSetLayout;
+        if (ly) {
+            _dsInfo.layout = ly;
+        }
 
         this._inputAssembler = this._device.createInputAssembler(subMesh.iaInfo);
         this._descriptorSet = this._device.createDescriptorSet(_dsInfo);
 
         const pipeline = (legacyCC.director.root as Root).pipeline;
         const occlusionPass = pipeline.pipelineSceneData.getOcclusionQueryPass()!;
         const occlusionDSInfo = new DescriptorSetInfo(null!);
-        occlusionDSInfo.layout = occlusionPass.localSetLayout;
+        const oly = occlusionPass.localSetLayout;
+        if (oly) {
+            occlusionDSInfo.layout = oly;
+        } 
         this._worldBoundDescriptorSet = this._device.createDescriptorSet(occlusionDSInfo);
         this._subMesh = subMesh;
         this._patches = patches;