[Port] [6000.2] Fixed disable light settings

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.universal/Runtime/ForwardLights.cs

@@ -186,6 +186,8 @@ out float4 viewToViewportScaleBias
         /// but also in unit testing.
         /// </summary>
         internal static JobHandle ScheduleClusteringJobs(
+            bool hasMainLight,
+            bool supportsAdditionalLights,
             NativeArray<VisibleLight> lights,
             NativeArray<VisibleReflectionProbe> probes,
             NativeArray<uint> zBins,
@@ -207,7 +209,7 @@ internal static JobHandle ScheduleClusteringJobs(
             out int wordsPerTile
         )
         {
-            localLightCount = lights.Length;
+            localLightCount = supportsAdditionalLights ? lights.Length: 0;
             // The lights array first has directional lights, and then local lights. We traverse the list to find the
             // index of the first local light.
             var firstLocalLightIdx = 0;
@@ -217,8 +219,18 @@ out int wordsPerTile
             }
             localLightCount -= firstLocalLightIdx;
 
-            // If there's 1 or more directional lights, one of them must be the main light
-            directionalLightCount = firstLocalLightIdx > 0 ? firstLocalLightIdx - 1 : 0;
+            // If there's 1 or more directional lights, one of them could be the main light
+            if (firstLocalLightIdx > 0)
+            {
+
+                directionalLightCount = firstLocalLightIdx;
+                if (hasMainLight)
+                    directionalLightCount -= 1;
+            }
+            else
+            {
+                directionalLightCount = 0;
+            }
 
             var localLights = lights.GetSubArray(firstLocalLightIdx, localLightCount);
 
@@ -400,6 +412,8 @@ internal void PreSetup(UniversalRenderingData renderingData, UniversalCameraData
                 var viewToClips = new Fixed2<float4x4>(cameraData.GetProjectionMatrix(0), cameraData.GetProjectionMatrix(math.min(1, viewCount - 1)));
 
                 m_CullingHandle = ScheduleClusteringJobs(
+                    lightData.mainLightIndex != -1,
+                    lightData.supportsAdditionalLights,
                     lightData.visibleLights,
                     renderingData.cullResults.visibleReflectionProbes,
                     m_ZBins,
@@ -656,12 +670,13 @@ void SetupAdditionalLightConstants(UnsafeCommandBuffer cmd, ref CullingResults c
             int additionalLightsCount = SetupPerObjectLightIndices(cullResults, lightData);
             if (additionalLightsCount > 0)
             {
+                int mainLight = lightData.mainLightIndex;
                 if (m_UseStructuredBuffer)
                 {
                     NativeArray<ShaderInput.LightData> additionalLightsData = new NativeArray<ShaderInput.LightData>(additionalLightsCount, Allocator.Temp);
                     for (int i = 0, lightIter = 0; i < lights.Length && lightIter < maxAdditionalLightsCount; ++i)
                     {
-                        if (lightData.mainLightIndex != i)
+                        if (mainLight != i)
                         {
                             ShaderInput.LightData data;
                             InitializeLightConstants(lights, i, supportsLightLayers,
@@ -688,7 +703,7 @@ void SetupAdditionalLightConstants(UnsafeCommandBuffer cmd, ref CullingResults c
                 {
                     for (int i = 0, lightIter = 0; i < lights.Length && lightIter < maxAdditionalLightsCount; ++i)
                     {
-                        if (lightData.mainLightIndex != i)
+                        if (mainLight != i)
                         {
                             InitializeLightConstants(
                                 lights,

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipeline.cs

@@ -1833,18 +1833,6 @@ static UniversalLightData CreateLightData(ContextContainer frameData, UniversalR
                 lightData.maxPerObjectAdditionalLightsCount = 0;
             }
 
-            if (settings.mainLightRenderingMode == LightRenderingMode.Disabled)
-            {
-                var mainLightIndex = GetBrightestDirectionalLightIndex(settings, visibleLights);
-                if (mainLightIndex != -1)
-                {
-                    // a visible main light was disabled, since it is still in the visible lights array we need to maintain
-                    // the mainLightIndex otherwise indexing in the lightloop goes wrong
-                    lightData.additionalLightsCount--;
-                    lightData.mainLightIndex = mainLightIndex;
-                }
-            }
-
             lightData.supportsAdditionalLights = settings.additionalLightsRenderingMode != LightRenderingMode.Disabled;
             lightData.shadeAdditionalLightsPerVertex = settings.additionalLightsRenderingMode == LightRenderingMode.PerVertex;
             lightData.supportsMixedLighting = settings.supportsMixedLighting;

Packages/com.unity.render-pipelines.universal/Tests/Runtime/LightClusteringTests.cs

@@ -61,6 +61,8 @@ public void LightClustering_WhenLightVolumeIntersectionWithXZPlaneIsOutsideTheSc
             float farPlane = 1000f;
 
             JobHandle handle = ForwardLights.ScheduleClusteringJobs(
+                false,
+                true,
                 lights,
                 probes,
                 zBins,