[Port] [6000.3] [UUM-139229][URP 2D] Fix preview camera missing lighting and shadows

Author: kennytann

Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawLight2DPass.cs

@@ -180,20 +180,12 @@ internal void Render(RenderGraph graph, ContextContainer frameData, Renderer2DDa
             Universal2DResourceData universal2DResourceData = frameData.Get<Universal2DResourceData>();
             UniversalCameraData cameraData = frameData.Get<UniversalCameraData>();
 
-            DebugHandler debugHandler = ScriptableRenderPass.GetActiveDebugHandler(cameraData);
-            var isDebugLightingActive = debugHandler?.IsLightingActive ?? true;
-
-#if UNITY_EDITOR
-            if (cameraData.isSceneViewCamera && UnityEditor.SceneView.currentDrawingSceneView != null)
-                isDebugLightingActive &= UnityEditor.SceneView.currentDrawingSceneView.sceneLighting;
-
-            if (cameraData.camera.cameraType == CameraType.Preview)
-                isDebugLightingActive = false;
-#endif
+            // Check for lighting in scene/prefab/preview camera 
+            var isLightingActive = Renderer2D.s_IsLightingActive;
 
             if (!layerBatch.lightStats.useLights ||
                 isVolumetric && !layerBatch.lightStats.useVolumetricLights ||
-                !isDebugLightingActive)
+                !isLightingActive)
                 return;
 
             // Render single RTs by for apis that don't support MRTs

Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawRenderer2DPass.cs

@@ -39,7 +39,7 @@ private static void Execute(RasterGraphContext context, PassData passData)
             RendererLighting.SetLightShaderGlobals(cmd, passData.lightBlendStyles, passData.blendStyleIndices);
 
 #if UNITY_EDITOR
-            if (passData.isLitView)
+            if (passData.isLightingActive)
 #endif
             {
                 if (passData.layerUseLights)
@@ -87,7 +87,7 @@ class PassData
             internal bool activeDebugHandler;
 
 #if UNITY_EDITOR
-            internal bool isLitView; // Required for prefab view and preview camera
+            internal bool isLightingActive; // Required for prefab view and preview camera
 #endif
         }
 
@@ -100,35 +100,23 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
             CommonResourceData commonResourceData = frameData.Get<CommonResourceData>();
 
             var layerBatch = layerBatches[batchIndex];
-            bool isLitView = true;
 
-#if UNITY_EDITOR
-            // Early out for prefabs
-            if (cameraData.isSceneViewCamera && UnityEditor.SceneView.currentDrawingSceneView != null)
-                isLitView = UnityEditor.SceneView.currentDrawingSceneView.sceneLighting;
-
-            // Early out for preview camera
-            if (cameraData.cameraType == CameraType.Preview)
-                isLitView = false;
-
-            DebugHandler debugHandler = GetActiveDebugHandler(cameraData);
-            if (debugHandler != null)
-                isLitView = debugHandler.IsLightingActive;
-#endif
+            // Check for lighting in scene/prefab/preview camera 
+            var isLightingActive = Renderer2D.s_IsLightingActive;
 
             // Preset global light textures for first batch
             if (batchIndex == 0)
             {
                 using (var builder = graph.AddRasterRenderPass<SetGlobalPassData>(k_SetLightBlendTexture, out var passData, m_SetLightBlendTextureProfilingSampler))
                 {
-                    if (layerBatch.lightStats.useLights && isLitView)
+                    if (layerBatch.lightStats.useLights && isLightingActive)
                     {
                         passData.lightTextures = universal2DResourceData.lightTextures[batchIndex];
                         for (var i = 0; i < passData.lightTextures.Length; i++)
                             builder.UseTexture(passData.lightTextures[i]);
                     }
 
-                    SetGlobalLightTextures(graph, builder, passData.lightTextures, ref layerBatch, rendererData, isLitView);
+                    SetGlobalLightTextures(graph, builder, passData.lightTextures, ref layerBatch, rendererData, isLightingActive);
 
                     builder.AllowGlobalStateModification(true);
 
@@ -147,7 +135,7 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                 passData.isSceneLit = rendererData.lightCullResult.IsSceneLit();
                 passData.layerUseLights = layerBatch.lightStats.useLights;
 #if UNITY_EDITOR
-                passData.isLitView = isLitView;
+                passData.isLightingActive = isLightingActive;
 #endif
 
                 var drawSettings = CreateDrawingSettings(k_ShaderTags, renderingData, cameraData, lightData, SortingCriteria.CommonTransparent);
@@ -172,7 +160,7 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                     builder.UseRendererList(passData.rendererList);
                 }
 
-                if (passData.layerUseLights && isLitView)
+                if (passData.layerUseLights && isLightingActive)
                 {
                     passData.lightTextures = universal2DResourceData.lightTextures[batchIndex];
                     for (var i = 0; i < passData.lightTextures.Length; i++)
@@ -193,7 +181,7 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                 // Post set global light textures for next renderer pass 
                 var nextBatch = batchIndex + 1;
                 if (nextBatch < universal2DResourceData.lightTextures.Length)
-                    SetGlobalLightTextures(graph, builder, universal2DResourceData.lightTextures[nextBatch], ref layerBatches[nextBatch], rendererData, isLitView);
+                    SetGlobalLightTextures(graph, builder, universal2DResourceData.lightTextures[nextBatch], ref layerBatches[nextBatch], rendererData, isLightingActive);
 
                 builder.SetRenderFunc((PassData data, RasterGraphContext context) =>
                 {
@@ -202,9 +190,9 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
             }
         }
 
-        void SetGlobalLightTextures(RenderGraph graph, IRasterRenderGraphBuilder builder, TextureHandle[] lightTextures, ref LayerBatch layerBatch, Renderer2DData rendererData, bool isLitView)
+        void SetGlobalLightTextures(RenderGraph graph, IRasterRenderGraphBuilder builder, TextureHandle[] lightTextures, ref LayerBatch layerBatch, Renderer2DData rendererData, bool isLightingActive)
         {
-            if (isLitView)
+            if (isLightingActive)
             {
                 if (layerBatch.lightStats.useLights)
                 {

Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/Renderer2DRendergraph.cs

@@ -69,6 +69,7 @@ private struct ImportResourceSummary
         internal bool m_CreateColorTexture;
         internal bool m_CreateDepthTexture;
         bool ppcUpscaleRT = false;
+        static internal bool s_IsLightingActive;
 
         PostProcessPassRenderGraph m_PostProcessPassRenderGraph;
         ColorGradingLutPass m_ColorGradingLutPassRenderGraph;
@@ -343,8 +344,10 @@ public override void SetupCullingParameters(ref ScriptableCullingParameters cull
         void InitializeLayerBatches()
         {
             Universal2DResourceData resourceData = frameData.Get<Universal2DResourceData>();
+            UniversalCameraData cameraData = frameData.Get<UniversalCameraData>();
 
             m_LayerBatches = LayerUtility.CalculateBatches(m_Renderer2DData, out m_BatchCount);
+            s_IsLightingActive = IsSceneViewOrPreviewLightingActive(cameraData);
 
             // Initialize textures dependent on batch size
             if (resourceData.normalsTexture.Length != m_BatchCount)
@@ -1074,5 +1077,21 @@ internal static bool supportsMRT
         }
 
         internal override bool supportsNativeRenderPassRendergraphCompiler => true;
+
+        static internal bool IsSceneViewOrPreviewLightingActive(UniversalCameraData cameraData)
+        {
+            DebugHandler debugHandler = ScriptableRenderPass.GetActiveDebugHandler(cameraData);
+            var isLightingActive = debugHandler?.IsLightingActive ?? true;
+
+#if UNITY_EDITOR
+            if (cameraData.isSceneViewCamera && UnityEditor.SceneView.currentDrawingSceneView != null)
+                isLightingActive &= UnityEditor.SceneView.currentDrawingSceneView.sceneLighting;
+
+            if (cameraData.isPreviewCamera && cameraData.camera.name == "Preview Scene Camera")
+                isLightingActive = false;
+#endif
+
+            return isLightingActive;
+        }
     }
 }