Merge pull request #8246 from Unity-Technologies/internal/6000.4/staging

Mirror Internal/6000.4/staging

Author: KEngelstoft

Packages/com.unity.render-pipelines.core/Editor/HeaderFoldout.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Serialization.Configuration;
 using UnityEngine;
 using UnityEngine.UIElements;
 

Packages/com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.EnvironmentLibrarySidePanel.cs

@@ -428,7 +428,7 @@ void IEnvironmentDisplayer.Repaint()
         void OnFocus()
         {
             //OnFocus is called before OnEnable that open backend if not already opened, so only sync if backend is open
-            if (LookDev.open)
+            if (LookDev.open && LookDev.currentContext != null)
             {
                 //If EnvironmentLibrary asset as been edited by the user (deletion),
                 //update all view to use null environment if it was not temporary ones

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-PrivateShared/AssemblyInfo.cs

@@ -1,8 +1,10 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Runtime")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor")]
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Runtime")]
 
 

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge.meta

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Runtime.Shared")]

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge/AssemblyInfo.cs

@@ -0,0 +1,23 @@
+using UnityEngine.Rendering;
+
+// /!\ Some API shared through this bridge are in Editor assembly.
+// Be sure to not forget #if UNITY_EDITOR for them
+
+namespace Unity.RenderPipelines.Core.Runtime.Shared.Bridge
+{
+#if UNITY_EDITOR
+    internal static class RenderPipelineEditorUtilityBridge
+    {
+        internal static bool TryMigrateRenderingLayersToTagManager<T>(string[] renderingLayerNames)
+            where T : RenderPipeline
+        {
+            return UnityEditor.Rendering.RenderPipelineEditorUtility.TryMigrateRenderingLayersToTagManager<T>(renderingLayerNames);
+        }
+
+        internal static void ClearMigratedRenderPipelines()
+        {
+            UnityEditor.Rendering.RenderPipelineEditorUtility.ClearMigratedRenderPipelines();
+        }
+    }
+#endif
+}

Packages/com.unity.render-pipelines.core/Runtime-PrivateShared/InternalBridge/AssemblyInfo.cs.meta

@@ -0,0 +1,14 @@
+{
+    "name": "Unity.InternalAPIEngineBridge.RenderPipelines.Core.Runtime.Shared",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}