Fixed issue that was causing spot light shadows to not be rendered when cascades were enabled.

phi-lira · phi-lira · commit 7cbadcc022ab · 2017-03-22T11:11:57.000+01:00
diff --git a/Assets/LowEndMobilePipeline/LowEndMobilePipeline.cs b/Assets/LowEndMobilePipeline/LowEndMobilePipeline.cs
@@ -11,6 +11,7 @@ public class LowEndMobilePipeline : RenderPipeline
 
         private static readonly int kMaxCascades = 4;
         private static readonly int kMaxLights = 8;
+        private int m_ShadowCasterCascadesCount = kMaxCascades;
         private int m_ShadowMapProperty;
         private RenderTargetIdentifier m_ShadowMapRTID;
         private int m_DepthBufferBits = 24;
@@ -65,7 +66,7 @@ public override void Render(ScriptableRenderContext context, Camera[] cameras)
                 // Setup light and shadow shader constants
                 SetupLightShaderVariables(cull.visibleLights, context);
                 if (shadowsRendered)
-                    SetupShadowShaderVariables(context, m_ShadowSettings.directionalLightCascadeCount);
+                    SetupShadowShaderVariables(context, m_ShadowCasterCascadesCount);
 
                 // Render Opaques
                 var settings = new DrawRendererSettings(cull, camera, m_ForwardBasePassName);
@@ -185,7 +186,7 @@ private void SetupLightShaderVariables(VisibleLight[] lights, ScriptableRenderCo
 
         private bool RenderShadows(CullResults cullResults, ScriptableRenderContext context)
         {
-            int cascadeCount = m_ShadowSettings.directionalLightCascadeCount;
+            m_ShadowCasterCascadesCount = m_ShadowSettings.directionalLightCascadeCount;
 
             VisibleLight[] lights = cullResults.visibleLights;
             int lightCount = lights.Length;
@@ -199,10 +200,10 @@ private bool RenderShadows(CullResults cullResults, ScriptableRenderContext cont
                 {
                     lightIndex = i;
                     if (lights[i].lightType == LightType.Spot)
-                        cascadeCount = 1;
+                        m_ShadowCasterCascadesCount = 1;
 
                     shadowResolution = GetMaxTileResolutionInAtlas(m_ShadowSettings.shadowAtlasWidth,
-                        m_ShadowSettings.shadowAtlasHeight, cascadeCount);
+                        m_ShadowSettings.shadowAtlasHeight, m_ShadowCasterCascadesCount);
                     break;
                 }
             }
@@ -245,10 +246,10 @@ private bool RenderShadows(CullResults cullResults, ScriptableRenderContext cont
             }
             else if (lights[lightIndex].lightType == LightType.Directional)
             {
-                for (int cascadeIdx = 0; cascadeIdx < cascadeCount; ++cascadeIdx)
+                for (int cascadeIdx = 0; cascadeIdx < m_ShadowCasterCascadesCount; ++cascadeIdx)
                 {
                     needRendering = cullResults.ComputeDirectionalShadowMatricesAndCullingPrimitives(lightIndex,
-                    cascadeIdx, cascadeCount, splitRatio, shadowResolution, shadowNearPlane, out view, out proj,
+                    cascadeIdx, m_ShadowCasterCascadesCount, splitRatio, shadowResolution, shadowNearPlane, out view, out proj,
                         out settings.splitData);
 
                     m_DirectionalShadowSplitDistances[cascadeIdx] = settings.splitData.cullingSphere;
@@ -371,7 +372,7 @@ void SetShaderKeywords(CommandBuffer cmd)
             else
                 cmd.DisableShaderKeyword("_VERTEX_LIGHTS");
 
-            if (m_Asset.CascadeCount == 1)
+            if (m_ShadowCasterCascadesCount == 1)
                 cmd.DisableShaderKeyword("_SHADOW_CASCADES");
            	else
                 cmd.EnableShaderKeyword("_SHADOW_CASCADES");
