[Port] [6000.4] [Render Graph Viewer] Gather Debug data and properly update the connection when the player is disconnected.

Author: svc-reach-platform-support

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs

@@ -1131,7 +1131,7 @@ void SetSelectedExecutionIndex(int executionIndex)
             if (m_SelectedExecutionIndex != executionIndex)
             {
                 m_SelectedExecutionIndex = executionIndex;
-                UpdateCurrentDebugData();
+                UpdateCurrentDebugData(true);
             }
 
             // Using a custom toolbar menu instead of default Dropdown in order to get access to allowDuplicateNames,
@@ -2032,7 +2032,7 @@ void UpdateStatusLabel()
 
             string connectionStatus = m_IsDeviceConnected ? "Online" : "Offline";
 
-            bool isEditor = m_ConnectedDeviceName == "Editor";
+            bool isEditor = m_ConnectedDeviceName == k_EditorName;
             string sourceLabel = isEditor ? "Source: Editor" : $"Source: {m_ConnectedDeviceName} ({connectionStatus})";
 
             bool hasCapture = HasValidDebugData && m_LastDataCaptureTime != DateTime.MinValue;
@@ -2052,7 +2052,8 @@ void UpdateCurrentDebugData(bool force = false)
             {
                 m_CurrentDebugData = RenderGraphDebugSession.GetDebugData(m_SelectedRenderGraph, selectedExecutionItem.id);
 
-                if (HasValidDebugData)
+                // Update timestamp when we get valid data, or when forcing an update
+                if (HasValidDebugData || force)
                     m_LastDataCaptureTime = DateTime.Now;
             }
             else
@@ -2066,6 +2067,8 @@ void UpdateCurrentDebugData(bool force = false)
                     currentGraphDropdown.style.display = DisplayStyle.None;
                 if (currentExecutionToolbarMenu != null)
                     currentExecutionToolbarMenu.style.display = DisplayStyle.None;
+
+                m_LastDataCaptureTime = DateTime.MinValue;
             }
 
             UpdateStatusLabel();
@@ -2170,6 +2173,7 @@ void OnPlayerConnected(int playerID)
         void OnPlayerDisconnected(int playerID)
         {
             m_IsDeviceConnected = false;
+            m_ConnectedDeviceName = k_EditorName;
 
             if (!m_Paused)
             {

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Debug/RenderGraphDebugSession.cs

@@ -158,9 +158,27 @@ public static void EndSession()
             }
         }
 
-        public static List<string> GetRegisteredGraphs() => s_CurrentDebugSession.debugDataContainer.GetRenderGraphs();
+        public static List<string> s_EmptyRegisteredGraphs = new();
+        public static List<string> GetRegisteredGraphs()
+        {
+            if (s_CurrentDebugSession == null || s_CurrentDebugSession.debugDataContainer == null)
+            {
+                return s_EmptyRegisteredGraphs;
+            }
+
+            return s_CurrentDebugSession.debugDataContainer.GetRenderGraphs();
+        }
 
-        public static List<DebugExecutionItem> GetExecutions(string graphName) => s_CurrentDebugSession.debugDataContainer.GetExecutions(graphName);
+        public static List<DebugExecutionItem> s_EmptyExecutions = new();
+        public static List<DebugExecutionItem> GetExecutions(string graphName)
+        {
+            if (s_CurrentDebugSession == null || s_CurrentDebugSession.debugDataContainer == null)
+            {
+                return s_EmptyExecutions;
+            }
+
+            return s_CurrentDebugSession.debugDataContainer.GetExecutions(graphName);
+        }
 
         public static DebugData GetDebugData(string renderGraph, EntityId executionId)
         {