Internal/6000.5/staging

Packages/com.unity.render-pipelines.core/Documentation~/render-graph-writing-a-render-pipeline.md

@@ -124,7 +124,7 @@ public class ExampleRenderPipeline : RenderPipeline
         } 
         catch (Exception e)
         {
-            if (renderGraph.ResetGraphAndLogException(e))
+            if (myRenderGraph.ResetGraphAndLogException(e))
                 throw;
         }
 

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -76,31 +76,26 @@ DebugUI.Panel selectedPanel
         VisualElement m_LeftPaneElement;
         VisualElement m_RightPaneElement;
 
-        const string k_UssCommon = "Packages/com.unity.render-pipelines.core/Runtime/DEbugging/Runtime UI Resources/DebugWindowCommon.uss";
+        const string k_UssCommon = "Packages/com.unity.render-pipelines.core/Runtime/Debugging/Runtime UI Resources/DebugWindowCommon.uss";
         const string k_Uss = "Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uss";
         const string k_Uxml = "Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.uxml";
 
-        bool m_IsDirty;
-
-        Vector2 m_PanelScroll;
-        Vector2 m_ContentScroll;
-
         void OnEnable()
         {
             DebugManager.instance.displayEditorUI = true;
 
-            DebugManager.instance.refreshEditorRequested = false;
-
             hideFlags = HideFlags.HideAndDontSave;
             autoRepaintOnSceneChange = true;
 
+            DebugManager.instance.onSetDirty += RequestRebuild;
+            DebugManager.instance.onRecreateDebugUI += RequestRebuild;
+            DebugManager.instance.onPanelSelectionRequested += SetSelectedPanel;
+
             if (m_WidgetStates == null || !AreWidgetStatesValid())
                 m_WidgetStates = new WidgetStateDictionary();
             if (s_WidgetStateMap == null || s_TypeMapDirty)
                 RebuildTypeMaps();
 
-            DebugManager.instance.onSetDirty += MarkDirty;
-
             GraphicsToolLifetimeAnalytic.WindowOpened<DebugWindow>();
 
             HookLegacyWidgetStateHandlingCallbacks();
@@ -160,6 +155,15 @@ static void SendWidgetValueChangedAnalytic<T>(string queryPath, T previousValue,
             GraphicsToolUsageAnalytic.ActionPerformed<DebugWindow>("Widget Value Changed", analytic.ToNestedColumn());
         }
 
+        private void OnDisable()
+        {
+            DebugManager.instance.onSetDirty -= RequestRebuild;
+            DebugManager.instance.onRecreateDebugUI -= RequestRebuild;
+            DebugManager.instance.onPanelSelectionRequested -= SetSelectedPanel;
+
+            GraphicsToolLifetimeAnalytic.WindowClosed<DebugWindow>();
+        }
+
         // Note: this won't get called if the window is opened when the editor itself is closed
         void OnDestroy()
         {
@@ -172,42 +176,22 @@ void OnDestroy()
                 if (debugWindows.Length == 0)
                     DebugManager.instance.displayEditorUI = false;
             };
-
-            DebugManager.instance.onSetDirty -= MarkDirty;
-
+
             DestroyWidgetStates();
         }
 
-        private void OnDisable()
-        {
-            GraphicsToolLifetimeAnalytic.WindowClosed<DebugWindow>();
-        }
+        bool m_NeedsRebuild;
 
-        void MarkDirty()
+        void RequestRebuild()
         {
-            m_IsDirty = true;
+            m_NeedsRebuild = true;
         }
 
         void Update()
         {
-            // If the render pipeline asset has been reloaded we force-refresh widget states in case
-            // some debug values need to be refresh/recreated as well (e.g. frame settings on HD)
-            if (DebugManager.instance.refreshEditorRequested)
-            {
-                ReloadWidgetStates();
-                m_IsDirty = true;
-                DebugManager.instance.refreshEditorRequested = false;
-            }
-
-            string requestedPanel = DebugManager.instance.GetRequestedEditorWindowPanel();
-            if (requestedPanel != null)
-            {
-                SetSelectedPanel(requestedPanel);
-            }
-
-            if (m_IsDirty)
+            if (m_NeedsRebuild)
             {
-                m_IsDirty = false;
+                m_NeedsRebuild = false;
                 RecreateGUI();
             }
         }
@@ -293,6 +277,8 @@ private void RecreateGUI()
 
             BuildSearchCache();
             InitializeSearchField();
+
+            m_NeedsRebuild = false;
         }
 
         void ResetClicked()
@@ -308,6 +294,14 @@ void ResetClicked()
             if (string.IsNullOrEmpty(panelName))
                 return;
 
+            // UI elements may not be initialized yet if this is called before RecreateGUI
+            if (m_LeftPaneElement == null || m_RightPaneElement == null)
+            {
+                // Just update the selected panel name - RecreateGUI will apply it when it runs
+                m_SelectedPanelName = panelName;
+                return;
+            }
+
             if (selectedPanel != null)
             {
                 m_LeftPaneElement.Q<VisualElement>(name: $"{selectedPanel.displayName}_Tab")?.RemoveFromClassList("selected");

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/AdaptiveProbeVolumes.BakePipelineDriver.cs

@@ -45,6 +45,9 @@ internal bool RunInProgress()
             internal void Step(ref float progress, ref StageName stage) =>
                 Update(true, true, true, out progress, out stage);
 
+            internal void ClearProgress() =>
+                InvokeMethod(new object[] { }, out _);
+
             void SetEnableBakedLightmaps(bool enable) =>
                 InvokeMethod(new object[] { enable }, out _);
 

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.LightTransport.cs

@@ -206,6 +206,7 @@ public override void Dispose()
                     occlusionResults.Dispose();
                 renderingLayerMasks.Dispose();
 
+                bakePipelineDriver?.ClearProgress();
                 bakePipelineDriver?.Dispose();
             }
         }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs

@@ -328,9 +328,19 @@ static internal void RecomputeVOForDebugOnly()
             while (job.currentStep < job.stepCount)
                 job.Step();
 
-            foreach (var cell in m_BakingBatch.cells)
+            for (int c = 0; c < m_BakingBatch.cells.Count; ++c)
             {
+                var cell = m_BakingBatch.cells[c];
                 int numProbes = cell.probePositions.Length;
+
+                // Might have no offset vectors, if the previous bake wasn't using virtual offsets.
+                // If so, initialize them so the user can still preview what the offsets will do.
+                if (cell.offsetVectors == null)
+                {
+                    cell.offsetVectors = new Vector3[numProbes];
+                    m_BakingBatch.cells[c] = cell;
+                }
+
                 for (int i = 0; i < numProbes; ++i)
                 {
                     int j = cell.probeIndices[i];

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs

@@ -1930,7 +1930,7 @@ public static bool BakeAsync()
             if (Lightmapping.isRunning || AdaptiveProbeVolumes.isRunning || !PrepareBaking(BakeType.ApvOnly, DoProbePlacement, AdditionalGIBakeRequestsManager.GetProbeNormalizationRequests))
                 return false;
 
-            _asyncBakeTaskId = Progress.Start("Bake Adaptive Probe Volumes");
+            _asyncBakeTaskId = Progress.Start("Bake Adaptive Probe Volumes", options: Progress.Options.Synchronous);
             Progress.RegisterCancelCallback(_asyncBakeTaskId, () =>
             {
                 OnBakeCancelled();

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs

@@ -296,7 +296,7 @@ internal static void OpenProbeVolumeDebugPanel(object userData, string[] options
             var debugWindow = EditorWindow.GetWindow<DebugWindow>();
             debugWindow.titleContent = DebugWindow.s_TitleContent;
             debugWindow.Show();
-            DebugManager.instance.RequestEditorWindowPanel(ProbeReferenceVolume.k_DebugPanelName);
+            DebugManager.instance.RequestPanelSelection(ProbeReferenceVolume.k_DebugPanelName);
 #endif
         }
 
@@ -325,7 +325,7 @@ void BakeButtonCallback(object data)
             if (AdaptiveProbeVolumes.isRunning)
             {
                 if (GUILayout.Button(Styles.cancelBake, Styles.buttonStyle))
-                    AdaptiveProbeVolumes.Cancel();
+                    EditorApplication.delayCall += () => AdaptiveProbeVolumes.Cancel();
                 return;
             }
 
@@ -640,9 +640,8 @@ void InitializeSceneList()
                 onRemoveCallback = (list) =>
                 {
                     var guid = (string)list.list[list.index];
-                    activeSet.RemoveScene(guid);
                     Undo.RegisterCompleteObjectUndo(new Object[] { activeSet }, "Deleted scene in baking set");
-                    EditorUtility.SetDirty(activeSet);
+                    activeSet.RemoveScene(guid);
                 },
 
                 drawHeaderCallback = (rect) =>
@@ -888,7 +887,7 @@ internal static void BakeAPVButton()
             if (AdaptiveProbeVolumes.isRunning)
             {
                 if (GUILayout.Button(Styles.cancelBake))
-                    AdaptiveProbeVolumes.Cancel();
+                    EditorApplication.delayCall += () => AdaptiveProbeVolumes.Cancel();
             }
             else
             {

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

@@ -14,7 +14,15 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             euler = EditorGUI.Vector3Field(position, label, euler);
             EditorGUIUtility.wideMode = w;
             if (EditorGUI.EndChangeCheck())
-                property.quaternionValue = Quaternion.Euler(euler);
+            {
+                bool isFinite = (!float.IsNaN(euler.x) && !float.IsInfinity(euler.x) &&
+                    !float.IsNaN(euler.y) && !float.IsInfinity(euler.y) &&
+                    !float.IsNaN(euler.z) && !float.IsInfinity(euler.z));
+                if (isFinite)
+                {
+                    property.quaternionValue = Quaternion.Euler(euler.x, euler.y, euler.z);
+                }
+            }
         }
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Tools/MaterialUpgrader/MaterialUpgrader.Utils.cs

@@ -303,6 +303,8 @@ internal static string PerformUpgradeInternal(
             {
                 s_UpgradeLog.AppendLine($"{progressBarName}");
 
+                bool anyMaterialModified = false;
+
                 for (int materialIndex = 0; materialIndex < materialUpgrades.Count; ++materialIndex)
                 {
                     var entry = materialUpgrades[materialIndex];
@@ -323,11 +325,16 @@ internal static string PerformUpgradeInternal(
                     else
                     {
                         s_UpgradeLog.AppendLine($"Upgrading material: {entry.MaterialInfo.Name} using shader: {entry.MaterialInfo.ShaderName}");
-                        Upgrade(entry.MaterialInfo.Material, upgraders, flags);
+                        if (entry.MaterialInfo.Material != null)
+                        {
+                            Upgrade(entry.MaterialInfo.Material, upgraders, flags);
+                            anyMaterialModified = true;
+                        }
                     }
                 }
 
-                AssetDatabase.SaveAssets();
+                if (anyMaterialModified)
+                    AssetDatabase.SaveAssets();
 
                 if (showProgressBar)
                     EditorUtility.ClearProgressBar();

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

@@ -18,21 +18,29 @@ private void Reset()
             if (m_Settings != null)
             {
                 m_Settings.Reset();
-
-                // TODO: Tear the UI down and re-create it for now - this is horrible, so reset it instead.
-                UnregisterDebug();
-                RegisterDebug(m_Settings);
-                DebugManager.instance.RefreshEditor();
+                ReregisterDebugPanels();
             }
         }
 
+        /// <summary>
+        /// Unregisters and re-registers all DebugUI panels associated with the current <see cref="ISerializedDebugDisplaySettings"/>.
+        /// This effectively rebuilds the debug panel hierarchy without touching the Rendering Debugger window state itself.
+        /// </summary>
+        void ReregisterDebugPanels()
+        {
+            // TODO: Tear the UI down and re-create it for now - this is horrible, so reset it instead.
+            UnregisterDebug();
+            RegisterDebug(m_Settings);
+        }
+
         /// <summary>
         /// Register a display for the UI
         /// </summary>
         /// <param name="settings"><see cref="IDebugDisplaySettings"/> to be registered</param>
         public void RegisterDebug(IDebugDisplaySettings settings)
         {
             DebugManager.instance.RegisterData(this);
+            DebugManager.instance.onRecreateDebugUI += ReregisterDebugPanels;
             m_Settings = settings;
             m_Settings.Add(new DebugDisplaySettingsRenderGraph());
 
@@ -64,6 +72,7 @@ internal void InitializeDebugUI()
                         displayName: disposableSettingsPanel.PanelName,
                         createIfNull: true,
                         groupIndex: (disposableSettingsPanel is DebugDisplaySettingsPanel debugDisplaySettingsPanel) ? debugDisplaySettingsPanel.Order : 0);
+
 #if UNITY_EDITOR
                     if (DocumentationUtils.TryGetHelpURL(disposableSettingsPanel.GetType(), out var documentationUrl))
                         panel.documentationUrl = documentationUrl;
@@ -73,6 +82,7 @@ internal void InitializeDebugUI()
 
                     panel.flags = disposableSettingsPanel.Flags;
                     panels.Add(disposableSettingsPanel);
+
                     panelChildren.Add(panelWidgets);
                 };
 
@@ -99,6 +109,7 @@ public void UnregisterDebug()
                     DebugUI.Widget[] panelWidgets = disposableSettingsPanel.Widgets;
                     string panelId = disposableSettingsPanel.PanelName;
                     DebugUI.Panel panel = debugManager.GetPanel(panelId, true);
+
                     ObservableList<DebugUI.Widget> panelChildren = panel.children;
 
                     disposableSettingsPanel.Dispose();
@@ -109,6 +120,7 @@ public void UnregisterDebug()
             }
 
             debugManager.UnregisterData(this);
+            debugManager.onRecreateDebugUI -= ReregisterDebugPanels;
 
             DebugManager.windowStateChanged -= DebugUIOpened;
         }

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

@@ -291,7 +291,7 @@ internal static void OpenInRenderingDebugger(VolumeComponent volumeComponent = n
             if (panel == null)
                 return;
 
-            DebugManager.instance.RequestEditorWindowPanel(k_PanelTitle);
+            DebugManager.instance.RequestPanelSelection(k_PanelTitle);
 
             // Try to select the given volume component in the component selector drop down
             if (volumeComponent != null &&