Internal/master

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

@@ -29,11 +29,13 @@ sealed partial class DebugWindow
         readonly Dictionary<DebugUI.Widget, WidgetSearchData> m_WidgetSearchElementCache = new();
         readonly List<TextElement> m_PanelHeaderTextElements = new();
         UIElementSearchFilter m_SearchFilter;
+        Label m_NoResultsLabel;
 
         void BuildSearchCache()
         {
             m_WidgetSearchElementCache.Clear();
             m_PanelHeaderTextElements.Clear();
+            m_NoResultsLabel = rootVisualElement.Q<Label>(name: "debug-window-no-results-label");
 
             foreach (var panelElement in m_RightPaneElement.Children())
             {
@@ -76,6 +78,9 @@ void InitializeSearchField()
                             tab.style.display = shouldShow ? DisplayStyle.Flex : DisplayStyle.None;
                         }
                     }
+
+                    bool noResults = !string.IsNullOrEmpty(searchString) && visiblePanels.Count == 0;
+                    m_NoResultsLabel.style.display = noResults ? DisplayStyle.Flex : DisplayStyle.None;
                 }
             );
             m_SearchFilter.InitializeSearchField("search-field");

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

@@ -108,3 +108,8 @@
 .info-button:hover {
     background-color: var(--unity-colors-button-background-hover);
 }
+
+#debug-window-no-results-label {
+    display: none;
+    -unity-text-align: middle-center;
+}

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

@@ -15,6 +15,7 @@
         <ui:VisualElement name="debug-window-tab-container" class="">
             <ui:ScrollView horizontal-scroller-visibility="Hidden" view-data-key="debug-window-tab-container-scrollview">
                 <ui:VisualElement name="panels-inspector-insertion-element" />
+                <ui:Label name="debug-window-no-results-label" text="No results match your search." />
                 <ui:VisualElement name="scroll-buffer" />
             </ui:ScrollView>
         </ui:VisualElement>

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

@@ -892,6 +892,7 @@ static internal void Init()
                 Lightmapping.bakeStarted += OnBakeStarted;
                 Lightmapping.bakeCancelled += OnBakeCancelled;
                 Lightmapping.inputExtraction += OnInputExtraction;
+                AssemblyReloadEvents.beforeAssemblyReload += CleanUp;
             }
         }
 

Packages/com.unity.render-pipelines.core/Editor/SampleDependencyImportSystem/SampleDependencyImporter.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
@@ -40,7 +39,6 @@ static SampleDependencyImporter()
 
     PackageInfo m_PackageInfo;
     SampleList m_SampleList;
-    List<Sample> m_Samples;
 
     VisualElement injectingElement;
     VisualElement _panelRoot;
@@ -100,6 +98,7 @@ internal void RefreshSampleButtons()
 
         var bound = Mathf.Min(sampleContainers.Count, m_SampleList.samples.Length);
 
+        // Foreach sample
         for (int i=0; i<bound; i++)
         {
             // Check if the sample has dependencies, if not just skip the injection.
@@ -155,16 +154,20 @@ internal void RefreshSampleButtons()
 
                 // Need to copy i for the lambda.
                 var index = i;
-                // On click of the imported button, import the dependencies first then call the original button logic.
+                // On click of the imported button, import the dependencies first then use the package manager API to trigger the regular sample import logic.
                 injectedButton.clicked += () =>
                 {
                     ImportSampleDependencies(index);
 
-                    using (var ev = NavigationSubmitEvent.GetPooled())
+                    // After importing the dependencies, we can call the package manager API import logic.
+                    foreach (Sample sample in Sample.FindByPackage(m_PackageInfo.name, m_PackageInfo.version))
                     {
-                        ev.target = importButton;
-                        importButton.SendEvent(ev);
+                        if (sample.displayName == m_SampleList.samples[index].displayName)
+                        {
+                            sample.Import(Sample.ImportOptions.HideImportWindow | Sample.ImportOptions.OverridePreviousImports);
+                        }
                     }
+
                 };
             }
             else // We may need to update the button text after the sample import here.

Packages/com.unity.render-pipelines.core/Editor/Utilities/UIElementSearchFilter.cs

@@ -11,7 +11,7 @@ class UIElementSearchFilter
     {
         internal const string k_SelectionColorBeginTag = "<mark=#3169ACAB>";
         internal const string k_SelectionColorEndTag = "</mark>";
-        const int k_SearchStringLimit = 15;
+        const int k_SearchStringLimit = 32;
 
         IVisualElementScheduledItem m_PreviousSearch;
         string m_PendingSearchString;
@@ -28,6 +28,7 @@ public void InitializeSearchField(string searchFieldName)
         {
             var searchField = m_RootElement.Q<ToolbarSearchField>(searchFieldName);
             searchField.placeholderText = L10n.Tr("Search");
+            searchField.Q<TextField>().maxLength = k_SearchStringLimit;
             searchField.RegisterValueChangedCallback(evt => OnSearchFilterChanged(evt.newValue));
 
             // Apply empty search once in case the entire window was reloaded with a non-empty search. Search
@@ -37,13 +38,6 @@ public void InitializeSearchField(string searchFieldName)
 
         void OnSearchFilterChanged(string searchString)
         {
-            // Ensure the search string is within the allowed length limit
-            if (searchString.Length > k_SearchStringLimit)
-            {
-                searchString = searchString[..k_SearchStringLimit];
-                Debug.LogWarning($"Search string limit exceeded: {k_SearchStringLimit}");
-            }
-
             // Sanitize to not match rich text tags
             searchString = searchString.Replace("<", string.Empty).Replace(">", string.Empty);
 

Packages/com.unity.render-pipelines.core/Runtime/Camera/CameraHistory.cs

@@ -103,7 +103,7 @@ public interface ICameraHistoryReadAccess
     public abstract class CameraHistoryItem : ContextItem
     {
         // BufferedRTHandleSystem of the owning camera.
-        private BufferedRTHandleSystem m_owner = null;
+        private BufferedRTHandleSystem m_Owner = null;
         // Unique id for this type (derived) given by the owning camera.
         private uint m_TypeId = uint.MaxValue;
 
@@ -117,7 +117,7 @@ public abstract class CameraHistoryItem : ContextItem
         /// <param name="typeId">Unique id given to this class type by the owning camera.</param>
         public virtual void OnCreate(BufferedRTHandleSystem owner, uint typeId)
         {
-            m_owner = owner;
+            m_Owner = owner;
             m_TypeId = typeId;
         }
 
@@ -126,7 +126,7 @@ public virtual void OnCreate(BufferedRTHandleSystem owner, uint typeId)
         /// <summary>
         /// The owning camera RTHandle storage for the history textures.
         /// </summary>
-        protected BufferedRTHandleSystem storage => m_owner;
+        protected BufferedRTHandleSystem storage => m_Owner;
 
         /// <summary>
         /// Creates unique ids for the RTHandle storage.
@@ -173,7 +173,7 @@ protected RTHandle AllocHistoryFrameRT(int id, int count,
             RenderTextureDescriptor d = desc;
             // Simplified for typical history textures:
             // No shadows, no mipmaps, no aniso.
-            m_owner.AllocBuffer(id, count, ref desc, filterMode, TextureWrapMode.Clamp, false, 0, 0, name);
+            m_Owner.AllocBuffer(id, count, ref desc, filterMode, TextureWrapMode.Clamp, false, 0, 0, name);
             return GetCurrentFrameRT(0);
         }
 
@@ -183,7 +183,7 @@ protected RTHandle AllocHistoryFrameRT(int id, int count,
         /// <param name="id">Id for the history RTHandle storage.</param>
         protected void ReleaseHistoryFrameRT(int id)
         {
-            m_owner.ReleaseBuffer(id);
+            m_Owner.ReleaseBuffer(id);
         }
 
         /// <summary>
@@ -193,7 +193,7 @@ protected void ReleaseHistoryFrameRT(int id)
         /// <returns>The RTHandle from previous frame.</returns>
         protected RTHandle GetPreviousFrameRT(int id)
         {
-            return m_owner.GetFrameRT(id, 1);
+            return m_Owner.GetFrameRT(id, 1);
         }
 
         /// <summary>
@@ -203,7 +203,27 @@ protected RTHandle GetPreviousFrameRT(int id)
         /// <returns>The RTHandle of the current frame.</returns>
         protected RTHandle GetCurrentFrameRT(int id)
         {
-            return m_owner.GetFrameRT(id, 0);
+            return m_Owner.GetFrameRT(id, 0);
+        }
+
+        /// <summary>
+        /// Returns the id stable index from the previous frame.
+        /// </summary>
+        /// <param name="id">Id for the history RTHandle storage.</param>
+        /// <returns>The stable index from previous frame.</returns>
+        protected int GetPreviousFrameRTStableIndex(int id)
+        {
+            return m_Owner.GetFrameRTStableIndex(id, 1);
+        }
+
+        /// <summary>
+        /// Returns the id stable index of the current frame.
+        /// </summary>
+        /// <param name="id">Id for the history RTHandle storage.</param>
+        /// <returns>The stable index of the current frame.</returns>
+        protected int GetCurrentFrameRTStableIndex(int id)
+        {
+            return m_Owner.GetFrameRTStableIndex(id, 0);
         }
     }
 }

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

@@ -152,7 +152,7 @@ public bool displayPersistentRuntimeUI
                 }
                 else
                 {
-                    CoreUtils.Destroy(m_RuntimePersistentDebugUI.gameObject);
+                    CoreUtils.Destroy(m_RuntimePersistentDebugUI?.gameObject);
                     m_RuntimePersistentDebugUI = null;
                 }
             }

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

@@ -193,6 +193,10 @@ public void Reset()
             DebugDisplaySerializer.SaveFoldoutStates();
             DebugDisplaySerializer.Clear();
             resetData?.Invoke();
+#if ENABLE_RENDERING_DEBUGGER_UI
+            displayPersistentRuntimeUI = false;
+            ForEachWidget(w => { if (w is DebugUI.ValueTuple vt) vt.pinnedElementIndex = -1; });
+#endif
         }
 
         /// <summary>

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

@@ -875,8 +875,11 @@ protected override VisualElement Create()
 
                 this.ScheduleTracked(field, () => field.schedule.Execute(() =>
                 {
-                    if (currentIndex >= 0 && currentIndex < enumNames.Length)
-                        field.SetValueWithoutNotify(enumNames[currentIndex].text);
+                    // https://jira.unity3d.com/browse/UUM-138138: Clamp currentIndex to 0. This matches old IMGUI
+                    // DebugUIDrawer behavior where a negative index is sometimes used to denote an invalid/none value.
+                    int index = Mathf.Max(0, currentIndex);
+                    if (index < enumNames.Length)
+                        field.SetValueWithoutNotify(enumNames[index].text);
                 }).Every(100));
 
                 m_AdditionalSearchText = string.Join(",", field.choices);

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

@@ -127,7 +127,9 @@ void BuildDebugUI()
             else
                 selectedPanelName = m_SelectedPanel.displayName;
 
-            SetSelectedPanel(selectedPanelName);
+            // Defer until after layout so all AttachToPanelEvent callbacks from ScheduleTracked
+            // have fired and registered their schedulers before SetHierarchyEnabled is called.
+            m_TabViewElement.schedule.Execute(_ => SetSelectedPanel(selectedPanelName)).StartingIn(100);
         }
 
         void OnDestroy()