filter non default pass

cocos · Oct 16, 2024 · 734828d · 734828d
1 parent 408425c
commit 734828d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/EngineErrorMap.md b/EngineErrorMap.md
@@ -3339,6 +3339,10 @@ Custom pipeline invalid render phase, program: %s. Please reimport all effects (
 
 custom-pipeline module not available.
 
+### 12110
+
+MaterialPass passID in legacy pipeline is wrongly initialized.
+
 ### 13100
 
 Incorrect CCON magic.

diff --git a/cocos/render-scene/core/pass.ts b/cocos/render-scene/core/pass.ts
@@ -632,6 +632,19 @@ export class Pass {
                 errorID(12108, info.program);
                 return;
             }
+        } else  {
+            // Here we are in legacy-pipeline
+            // eslint-disable-next-line no-lonely-if
+            if (typeof info.phase === 'number') {
+                this._passID = (info as Pass)._passID;
+            } else if (info.pass && info.pass !== 'default') {
+                // In legacy pipeline, user might select invalid material,
+                // whose pass name is not 'default'.
+                // We should filter these passes.
+                // Here we set _passID to 0, if pass is not 'default'.
+                assertID(this._passID === 0xFFFFFFFF, 12110);
+                this._passID = 0;
+            }
         }
         this._phase = getPhaseID('default');
         this._primitive = PrimitiveMode.TRIANGLE_LIST;

diff --git a/cocos/rendering/forward/forward-stage.ts b/cocos/rendering/forward/forward-stage.ts
@@ -141,6 +141,7 @@ export class ForwardStage extends RenderStage {
                 for (p = 0; p < passes.length; ++p) {
                     const pass = passes[p];
                     if (pass.phase !== this._phaseID) continue;
+                    if (pass.passID !== 0xFFFFFFFF) continue;
                     const batchingScheme = pass.batchingScheme;
                     if (batchingScheme === BatchingSchemes.INSTANCING) {
                         const instancedBuffer = pass.getInstancedBuffer();

diff --git a/native/cocos/renderer/pipeline/forward/ForwardStage.cpp b/native/cocos/renderer/pipeline/forward/ForwardStage.cpp
@@ -113,6 +113,7 @@ void ForwardStage::dispenseRenderObject2Queues() {
             for (uint32_t passIdx = 0; passIdx < passCount; ++passIdx) {
                 const auto &pass = passes[passIdx];
                 if (pass->getPhase() != _phaseID) continue;
+                if (pass->getPassID() != 0xFFFFFFFF) continue;
                 if (pass->getBatchingScheme() == scene::BatchingSchemes::INSTANCING) {
                     auto *instancedBuffer = pass->getInstancedBuffer();
                     instancedBuffer->merge(subModel, passIdx);

diff --git a/native/cocos/scene/Pass.cpp b/native/cocos/scene/Pass.cpp
@@ -618,6 +618,20 @@ void Pass::doInit(const IPassInfoFull &info, bool /*copyDefines*/ /* = false */)
             CC_LOG_ERROR("Invalid phase ID");
             return;
         }
+    } else {
+        // Here we are in legacy-pipeline
+        if (info.phaseID != INVALID_ID) {
+            _passID = info.passID;
+        } else {
+            if (info.pass && *info.pass != "default") {
+                // In legacy pipeline, user might select invalid material,
+                // whose pass name is not 'default'.
+                // We should filter these passes.
+                // Here we set _passID to 0, if pass is not 'default'.
+                CC_ASSERT(_passID == INVALID_ID);
+                _passID = 0;
+            }
+        }
     }
     _phaseString = "default";
     _phase = pipeline::getPhaseID(_phaseString);