[Port] [6000.5] HDRP: Rendering Debugger - "Freeze Camera For Culling" dropdown was only showing None as an option.

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.Fields.cs

@@ -1040,6 +1040,41 @@ public CameraSelector()
             private Camera[] m_CamerasArray;
             private List<Camera> m_Cameras = new List<Camera>();
 
+#if ENABLE_RENDERING_DEBUGGER_UI
+            /// <inheritdoc/>
+            protected override VisualElement Create()
+            {
+                var objectPopUpField = base.Create() as UIElements.PopupField<UnityEngine.Object>;
+
+                if (objectPopUpField == null)
+                    return new Label("Error creating CameraSelector field");
+
+                objectPopUpField.choices ??= new List<UnityEngine.Object>() { null };
+
+                // Refresh the dropdown choices to keep it in sync with available cameras in the scene.
+                // NOTE: If the currently selected camera is deleted, PopupField handles it internally,
+                //       so we only need to maintain the available choices list.
+                this.ScheduleTracked(objectPopUpField, () => objectPopUpField.schedule.Execute(() =>
+                {
+                    // Using ListPool and SequenceEqual to avoid unnecessary allocations and UI updates
+                    using (UnityEngine.Pool.ListPool<UnityEngine.Object>.Get(out var tmp))
+                    {
+                        tmp.Add(null);
+                        tmp.AddRange(getObjects());
+
+                        if (!tmp.SequenceEqual(objectPopUpField.choices))
+                        {
+                            objectPopUpField.choices.Clear();
+                            objectPopUpField.choices.AddRange(tmp);
+                        }
+                    }
+
+                }).Every(500));
+
+                return objectPopUpField;
+            }
+#endif
+
             IEnumerable<Camera> cameras
             {
                 get

Packages/com.unity.render-pipelines.core/Runtime/Debugging/DebugUI.cs

@@ -308,22 +308,19 @@ internal VisualElement ToVisualElement(Context context)
                 m_Context = context;
                 m_VisualElement = Create();
 
-                //Debug.Log($"ToVisualElement for {queryPath}");
-
                 if (m_VisualElement == null)
                 {
                     Debug.LogWarning($"Unable to create a Visual Element for type {GetType()}");
                     return null;
                 }
                 m_VisualElement.AddToClassList("unity-inspector-element");
-
+                m_VisualElement.name = displayName;
 
 #if UNITY_EDITOR
                 // Support for legacy state handling
                 if (this is ISupportsLegacyStateHandling legacyStateWidget)
                 {
                     m_RequiresLegacyStateHandling = legacyStateWidget.RequiresLegacyStateHandling();
-                    //Debug.Log($"LegacyState: {m_RequiresLegacyStateHandling} ({queryPath})");
                 }
 #endif
 

Packages/com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs

@@ -273,12 +273,6 @@ public partial class DebugDisplaySettings : IDebugData, ISerializedDebugDisplayS
         static GUIContent[] s_RenderingMipmapDebugMaterialTextureSlotStrings = null;
         static int[] s_RenderingMipmapDebugMaterialTextureSlotValues = null;
 
-        static List<GUIContent> s_CameraNames = new List<GUIContent>() { new("None") };
-        static GUIContent[] s_CameraNamesStrings = { new ("No Visible Camera") };
-        static int[] s_CameraNamesValues = { 0 };
-
-        static bool needsRefreshingCameraFreezeList = true;
-
 #if ENABLE_NVIDIA && ENABLE_NVIDIA_MODULE
         internal UnityEngine.NVIDIA.DebugView nvidiaDebugView { get; } = new UnityEngine.NVIDIA.DebugView();
 #endif
@@ -341,8 +335,66 @@ public partial class DebugData
             public bool countRays = false;
             /// <summary>Display Show Lens Flare Data Driven Only.</summary>
             public bool showLensFlareDataDrivenOnly = false;
+
+            [Obsolete("This API has been deprecated. #from(6000.6)")] // TODO: Remove with debugCameraToFreeze
+            private static Camera[] GetAvailableDebuggableCameras()
+            {
+                using (ListPool<Camera>.Get(out var tmp))
+                {
+
+#if UNITY_EDITOR
+                    if (UnityEditor.SceneView.lastActiveSceneView != null)
+                    {
+                        var sceneCamera = UnityEditor.SceneView.lastActiveSceneView.camera;
+                        if (sceneCamera != null)
+                            tmp.Add(sceneCamera);
+                    }
+#endif
+
+                    var cameraArray = new Camera[Camera.allCamerasCount];
+                    Camera.GetAllCameras(cameraArray);
+
+                    foreach (var camera in cameraArray)
+                    {
+                        if (camera == null)
+                            continue;
+
+                        if (camera.cameraType != CameraType.Preview && camera.cameraType != CameraType.Reflection)
+                        {
+                            if (camera.TryGetComponent<IAdditionalData>(out _))
+                                tmp.Add(camera);
+                        }
+                    }
+
+                    return tmp.ToArray();
+                }
+            }
+
             /// <summary>Index of the camera to freeze for visibility.</summary>
-            public int debugCameraToFreeze = 0;
+            [Obsolete("Replace 'debugCameraToFreeze = index' with 'selectedCameraToFreeze = camera'. Index-based access is deprecated because camera list order is not stable. #from(6000.5)", false)]
+            public int debugCameraToFreeze
+            {
+                get
+                {
+                    var cameras = GetAvailableDebuggableCameras();
+                    if (cameras == null || cameras.Length == 0 || selectedCameraToFreeze == null)
+                        return -1;
+
+                    return Array.IndexOf(cameras, selectedCameraToFreeze);
+                }
+                set
+                {
+                    var cameras = GetAvailableDebuggableCameras();
+                    if (value < 0 || value >= cameras.Length)
+                        selectedCameraToFreeze = null;
+                    else
+                        selectedCameraToFreeze = cameras[value];
+                }
+            }
+
+            /// <summary>The camera to freeze for visibility.</summary>
+            public Camera selectedCameraToFreeze;
+
             internal RTASDebugView rtasDebugView = RTASDebugView.Shadows;
             internal RTASDebugMode rtasDebugMode = RTASDebugMode.InstanceID;
             internal VolumetricCloudsDebug volumetricCloudDebug = VolumetricCloudsDebug.Lighting;
@@ -680,7 +732,7 @@ public ColorPickerDebugMode GetDebugColorPickerMode()
         /// <returns>True if camera visibility is frozen</returns>
         public bool IsCameraFreezeEnabled()
         {
-            return data.debugCameraToFreeze != 0;
+            return data.selectedCameraToFreeze != null;
         }
 
         /// <summary>
@@ -690,7 +742,7 @@ public bool IsCameraFreezeEnabled()
         /// <returns>True if a specific camera is frozen for visibility.</returns>
         public bool IsCameraFrozen(Camera camera)
         {
-            return IsCameraFreezeEnabled() && camera.name.Equals(s_CameraNamesStrings[data.debugCameraToFreeze].text);
+            return IsCameraFreezeEnabled() && camera == data.selectedCameraToFreeze;
         }
 
         /// <summary>
@@ -1962,7 +2014,14 @@ void RegisterRenderingDebug()
                 });
             }
 
-            renderingSettings.children.Add(new DebugUI.EnumField { nameAndTooltip = RenderingStrings.FreezeCameraForCulling, getter = () => data.debugCameraToFreeze, setter = value => data.debugCameraToFreeze = value, enumNames = s_CameraNamesStrings, enumValues = s_CameraNamesValues, getIndex = () => data.debugCameraToFreezeEnumIndex, setIndex = value => data.debugCameraToFreezeEnumIndex = value });
+            var freezeCameraForCullingSelector = new DebugUI.CameraSelector()
+            {
+                nameAndTooltip = RenderingStrings.FreezeCameraForCulling,
+                getter = () => data.selectedCameraToFreeze,
+                setter = value => data.selectedCameraToFreeze = value as Camera
+            };
+
+            renderingSettings.children.Add(freezeCameraForCullingSelector);
 
             renderingSettings.children.Add(new DebugUI.Container
             {
@@ -2218,19 +2277,6 @@ internal void UpdateMaterials()
             }
         }
 
-        internal void UpdateCameraFreezeOptions()
-        {
-            if (needsRefreshingCameraFreezeList)
-            {
-                s_CameraNamesStrings = s_CameraNames.ToArray();
-                s_CameraNamesValues = Enumerable.Range(0, s_CameraNames.Count()).ToArray();
-
-                UnregisterRenderingDebug();
-                RegisterRenderingDebug();
-                needsRefreshingCameraFreezeList = false;
-            }
-        }
-
         internal bool DebugHideSky(HDCamera hdCamera)
         {
             return (IsMatcapViewEnabled(hdCamera) ||

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -2757,9 +2757,6 @@ AOVRequestData aovRequest
                 }
                 else
                 {
-#if DEVELOPMENT_BUILD || UNITY_EDITOR
-                    m_DebugDisplaySettings.UpdateCameraFreezeOptions();
-#endif
                     m_CurrentDebugDisplaySettings = m_DebugDisplaySettings;
                 }