[Port] [6000.0] [UUM-132565][UUM-132573] [6000.5][2D] Light Batching Debugger Fixes

Author: kennytann

Packages/com.unity.render-pipelines.universal/Editor/2D/LightBatchingDebugger/LightBatchingDebugger.cs

@@ -43,9 +43,11 @@ public static void ShowExample()
         // Variables used for refresh view
         private bool doRefresh;
         private int cachedSceneHandle;
+        private Vector3 cachedCamPos;
         private int totalLightCount;
         private int totalShadowCount;
-        private Vector3 cachedCamPos;
+        private string[] cachedLightNames;
+        private string[] cachedShadowCasterNames;
 
         ILight2DCullResult lightCullResult
         {
@@ -118,6 +120,9 @@ private VisualElement MakePill(UnityEngine.Object obj)
             var bubble = new Button();
             bubble.AddToClassList("Pill");
             bubble.text = obj.name;
+            bubble.style.maxWidth = 200;
+            bubble.style.overflow = Overflow.Hidden;
+            bubble.style.textOverflow = TextOverflow.Ellipsis;
 
             bubble.clicked += () =>
             {
@@ -469,8 +474,20 @@ private bool IsDirty()
 
             if (lightCullResult.IsGameView())
             {
+                var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters()).ToList();
+
                 isDirty |= totalLightCount != lightCullResult.visibleLights.Count();
-                isDirty |= totalShadowCount != lightCullResult.visibleShadows.Count();
+                isDirty |= totalShadowCount != visibleShadows.Count();
+
+                // Account for name changes
+                if (!isDirty)
+                {
+                    for (int i = 0; i < totalLightCount; ++i)
+                        isDirty |= !lightCullResult.visibleLights.Exists(x => x != null && x.name == cachedLightNames[i]);
+
+                    for (int i = 0; i < totalShadowCount; ++i)
+                        isDirty |= !visibleShadows.Exists(x => x != null && x.name == cachedShadowCasterNames[i]);
+                }
             }
 
             return isDirty;
@@ -485,8 +502,27 @@ private void ResetDirty()
 
             if (lightCullResult != null)
             {
+                var visibleShadows = lightCullResult.visibleShadows.SelectMany(x => x.GetShadowCasters());
+
                 totalLightCount = lightCullResult.visibleLights.Count();
-                totalShadowCount = lightCullResult.visibleShadows.Count();
+                totalShadowCount = visibleShadows.Count();
+
+                cachedLightNames = new string[totalLightCount];
+                cachedShadowCasterNames = new string[totalShadowCount];
+
+                for (int i = 0; i < totalLightCount; ++i)
+                {
+                    var light = lightCullResult.visibleLights[i];
+                    if (light != null)
+                        cachedLightNames[i] = light.name;
+                }
+
+                for (int i = 0; i < totalShadowCount; ++i)
+                {
+                    var shadowCaster = visibleShadows.ElementAt(i);
+                    if (shadowCaster != null)
+                        cachedShadowCasterNames[i] = shadowCaster.name;
+                }
             }
 
             doRefresh = false;