fix disabled shadow inconsistency (#17337)

cocos · Jul 9, 2024 · 7b563e6 · 7b563e6
1 parent 1aa1e56
commit 7b563e6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/native/cocos/renderer/pipeline/custom/NativeBuiltinUtils.cpp b/native/cocos/renderer/pipeline/custom/NativeBuiltinUtils.cpp
@@ -30,7 +30,6 @@
 #include "cocos/renderer/pipeline/PipelineSceneData.h"
 #include "cocos/renderer/pipeline/custom/LayoutGraphTypes.h"
 #include "cocos/renderer/pipeline/custom/NativePipelineTypes.h"
-#include "cocos/renderer/pipeline/custom/NativeTypes.h"
 #include "cocos/renderer/pipeline/custom/NativeUtils.h"
 #include "cocos/renderer/pipeline/custom/RenderGraphTypes.h"
 #include "cocos/renderer/pipeline/custom/details/GslUtils.h"
@@ -873,7 +872,7 @@ const BuiltinCascadedShadowMap *getBuiltinShadowCSM(
     return &csm;
 }
 
-const geometry::Frustum &getBuiltinShadowFrustum(
+const geometry::Frustum *getBuiltinShadowFrustum(
     const PipelineRuntime &pplRuntime,
     const scene::Camera &camera,
     const scene::DirectionalLight *mainLight,
@@ -882,22 +881,22 @@ const geometry::Frustum &getBuiltinShadowFrustum(
 
     const auto &shadows = *ppl.pipelineSceneData->getShadows();
     if (shadows.getType() == scene::ShadowType::PLANAR) {
-        return camera.getFrustum();
+        return &camera.getFrustum();
     }
 
     BuiltinCascadedShadowMapKey key{&camera, mainLight};
     auto iter = ppl.builtinCSMs.find(key);
     if (iter == ppl.builtinCSMs.end()) {
-        throw std::runtime_error("Builtin shadow CSM not found");
+        return nullptr;
     }
 
     const auto &csmLevel = mainLight->getCSMLevel();
     const auto &csm = iter->second;
 
     if (mainLight->isShadowFixedArea() || csmLevel == scene::CSMLevel::LEVEL_1) {
-        return csm.specialLayer.validFrustum;
+        return &csm.specialLayer.validFrustum;
     }
-    return csm.layers[level].validFrustum;
+    return &csm.layers[level].validFrustum;
 }
 
 } // namespace render

diff --git a/native/cocos/renderer/pipeline/custom/NativeBuiltinUtils.h b/native/cocos/renderer/pipeline/custom/NativeBuiltinUtils.h
@@ -111,7 +111,7 @@ const BuiltinCascadedShadowMap *getBuiltinShadowCSM(
     const scene::Camera &camera,
     const scene::DirectionalLight *mainLight);
 
-const geometry::Frustum &getBuiltinShadowFrustum(
+const geometry::Frustum *getBuiltinShadowFrustum(
     const PipelineRuntime &pplRuntime,
     const scene::Camera &camera,
     const scene::DirectionalLight *mainLight,

diff --git a/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp b/native/cocos/renderer/pipeline/custom/NativeSceneCulling.cpp
@@ -345,14 +345,16 @@ void SceneCulling::batchFrustumCulling(const NativePipeline& ppl) {
                         break;
                     case scene::LightType::DIRECTIONAL: {
                         const auto* mainLight = dynamic_cast<const scene::DirectionalLight*>(light);
-                        const auto& frustum = getBuiltinShadowFrustum(ppl, camera, mainLight, level);
-                        sceneCulling(
-                            skyboxModel,
-                            *scene, camera,
-                            frustum,
-                            bCastShadow,
-                            nullptr,
-                            models);
+                        const auto* frustum = getBuiltinShadowFrustum(ppl, camera, mainLight, level);
+                        if (frustum) {
+                            sceneCulling(
+                                skyboxModel,
+                                *scene, camera,
+                                *frustum,
+                                bCastShadow,
+                                nullptr,
+                                models);
+                        }
                     } break;
                     default:
                         // noop