Merge pull request #8149 from Unity-Technologies/internal/master

Internal/master

Author: UnityAljosha

.gitattributes

@@ -64,6 +64,11 @@ Repositories.ini eol=lf
 *.[mM][sS][iI] filter=lfs diff=lfs merge=lfs -text
 *.[aA][rR][cC] filter=lfs diff=lfs merge=lfs -text
 
+# media files
+*.[mM][pP]4 filter=lfs diff=lfs merge=lfs -text
+*.[mM][oO][vV] filter=lfs diff=lfs merge=lfs -text
+*.[wW][eE][bB][mM] filter=lfs diff=lfs merge=lfs -text
+
 # executables and libraries
 *.[aA] filter=lfs diff=lfs merge=lfs -text
 *.[oO] filter=lfs diff=lfs merge=lfs -text
@@ -361,6 +366,12 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 **/GfxTestProjectFolder/**/*.[pP][rR][xX] filter=lfs diff=lfs merge=lfs -text
 **/GfxTestProjectFolder/**/*.[dD][fF][oO][nN][tT] filter=lfs diff=lfs merge=lfs -text
 
+# Video tests
+# ---
+# `.ts` is used for MPEG Transport Stream files. This rule is very specific to a certain video
+# package because the `.ts` extension clashes with the TypeScript file extension.
+**/EditModeAndPlayModeTests/Video/**/HLS/**/*.[tT][sS] filter=lfs diff=lfs merge=lfs -text
+
 # memoryprofiler test snapshots
 **/com.unity.memoryprofiler.tests/**/*.[sS][nN][aA][pP] filter=lfs diff=lfs merge=lfs -text
 

Packages/com.unity.render-pipelines.core/Documentation~/customize-ui-for-a-setting.md

@@ -55,16 +55,16 @@ public class MySettingsPropertyDrawer : PropertyDrawer
 
 To add items to the **More** (⋮) menu of a settings group, follow these steps:
 
-1. Create a class that implements the [`IRenderPipelineGraphicsSettingsContextMenu`](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu.html) interface.
+1. Create a class that implements the [`IRenderPipelineGraphicsSettingsContextMenu2<T>`](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2_1.html) interface.
 2. Implement the `PopulateContextMenu` method.
 3. To add an item, use the `AddItem` API.
 
 For example:
 
 ```c#
-public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu<MySettings>
+public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu2<MySettings>
 {
-    void IRenderPipelineGraphicsSettingsContextMenu<MySettings>.PopulateContextMenu(MySettings setting, PropertyDrawer _, ref GenericMenu menu)
+    void IRenderPipelineGraphicsSettingsContextMenu2<MySettings>.PopulateContextMenu(MySettings setting, SerializedProperty _, ref GenericMenu menu)
     {
         menu.AddItem(new GUIContent("My custom menu item"), false, () => { Debug.Log("Menu item was selected."); });
     }
@@ -74,4 +74,5 @@ public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu<
 ## Additional resources
 
 - [PropertyDrawer](xref:UnityEditor.PropertyDrawer)
-- [IRenderPipelineGraphicsSettingsContextMenu](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu.html)
+- [IRenderPipelineGraphicsSettingsContextMenu2](https://docs.unity3d.com/6000.2/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2.html)
+- [IRenderPipelineGraphicsSettingsContextMenu2<T>](https://docs.unity3d.com/6000.2/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2_1.html)

Packages/com.unity.render-pipelines.core/Documentation~/srp-creating-render-pipeline-asset-and-render-pipeline-instance.md

@@ -45,13 +45,14 @@ The following example shows how to create a script for a basic custom Render Pip
     ```lang-csharp
     using UnityEngine;
     using UnityEngine.Rendering;
+    using System.Collections.Generic;
     
     public class ExampleRenderPipelineInstance : RenderPipeline
     {
         public ExampleRenderPipelineInstance() {
         }
     
-        protected override void Render (ScriptableRenderContext context, Camera[] cameras) {
+        protected override void Render (ScriptableRenderContext context, List<Camera> cameras) {
             // This is where you can write custom rendering code. Customize this method to customize your SRP.
         }
     }
@@ -98,6 +99,7 @@ The following example shows how to create a `RenderPipelineAsset` script that de
     ```lang-csharp
     using UnityEngine;
     using UnityEngine.Rendering;
+    using System.Collections.Generic;
     
     public class ExampleRenderPipelineInstance : RenderPipeline
     {
@@ -119,4 +121,4 @@ The following example shows how to create a `RenderPipelineAsset` script that de
 
     ```
 
-5. In the Project view, either click the add (+) button, or open the context menu and navigate to  **Create**, and then choose **Rendering** > **Example Render Pipeline Asset**. Unity creates a new Render Pipeline Asset in the Project view.
+5. In the Project view, either click the add (+) button, or open the context menu and navigate to  **Create**, and then choose **Rendering** > **Example Render Pipeline Asset**. Unity creates a new Render Pipeline Asset in the Project view.

Packages/com.unity.render-pipelines.core/Documentation~/srp-creating-simple-render-loop.md

@@ -131,12 +131,13 @@ It shows the clearest workflow, rather than the most efficient runtime performan
 
 using UnityEngine;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
 
 public class ExampleRenderPipeline : RenderPipeline {
     public ExampleRenderPipeline() {
     }
 
-    protected override void Render (ScriptableRenderContext context, Camera[] cameras) {
+    protected override void Render(ScriptableRenderContext context, List<Camera> cameras) {
         // Create and schedule a command to clear the current render target
         var cmd = new CommandBuffer();
         cmd.ClearRenderTarget(true, true, Color.black);
@@ -172,12 +173,13 @@ It shows the clearest workflow, rather than the most efficient runtime performan
 
 using UnityEngine;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
 
 public class ExampleRenderPipeline : RenderPipeline {
     public ExampleRenderPipeline() {
     }
 
-    protected override void Render (ScriptableRenderContext context, Camera[] cameras) {
+    protected override void Render(ScriptableRenderContext context, List<Camera> cameras) {
         // Create and schedule a command to clear the current render target
         var cmd = new CommandBuffer();
         cmd.ClearRenderTarget(true, true, Color.black);
@@ -225,12 +227,13 @@ It shows the clearest workflow, rather than the most efficient runtime performan
 
 using UnityEngine;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
 
 public class ExampleRenderPipeline : RenderPipeline {
     public ExampleRenderPipeline() {
     }
 
-    protected override void Render (ScriptableRenderContext context, Camera[] cameras) {
+    protected override void Render(ScriptableRenderContext context, List<Camera> cameras) {
         // Create and schedule a command to clear the current render target
         var cmd = new CommandBuffer();
         cmd.ClearRenderTarget(true, true, Color.black);

Packages/com.unity.render-pipelines.core/Documentation~/srp-using-scriptable-render-context.md

@@ -26,11 +26,12 @@ This example code demonstrates how to schedule and perform a command to clear th
 ```lang-csharp
 using UnityEngine;
 using UnityEngine.Rendering;
+using System.Collections.Generic;
 
 public class ExampleRenderPipeline : RenderPipeline
 {
-        public ExampleRenderPipeline() {
-        }
+    public ExampleRenderPipeline() {
+    }
 
     protected override void Render(ScriptableRenderContext context, List<Camera> cameras) {
         // Create and schedule a command to clear the current render target

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

@@ -477,14 +477,16 @@ static void DisplayColumns(Rect drawRect, List<GUIContent> rowContents)
         /// <param name="state">Debug State associated with the Debug Item.</param>
         public override void Begin(DebugUI.Widget widget, DebugState state)
         {
+            CoreEditorUtils.DrawSplitter();
+            
             var w = Cast<DebugUI.Foldout>(widget);
             var s = Cast<DebugStateBool>(state);
 
             var title = EditorGUIUtility.TrTextContent(w.displayName, w.tooltip);
 
             Action<GenericMenu> fillContextMenuAction = null;
 
-            if (w.contextMenuItems != null)
+            if (w.contextMenuItems is { Count: > 0 })
             {
                 fillContextMenuAction = menu =>
                 {
@@ -495,7 +497,7 @@ public override void Begin(DebugUI.Widget widget, DebugState state)
                 };
             }
 
-            bool previousValue = (bool)w.GetValue();
+            bool previousValue = w.GetValue();
             bool value = CoreEditorUtils.DrawHeaderFoldout(title, previousValue, isTitleHeader: w.isHeader, customMenuContextAction: fillContextMenuAction, documentationURL: w.documentationUrl);
             if (previousValue != value)
                 Apply(w, s, value);

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

@@ -132,6 +132,7 @@ static void Init()
         {
             var window = GetWindow<DebugWindow>();
             window.titleContent = Styles.windowTitle;
+            window.minSize = new Vector2(800f, 300f);
         }
 
         [MenuItem("Window/Analysis/Rendering Debugger", validate = true)]
@@ -409,16 +410,6 @@ void OnGUI()
                 return;
             }
 
-            // Background color
-            var wrect = position;
-            wrect.x = 0;
-            wrect.y = 0;
-            var oldColor = GUI.color;
-            GUI.color = s_Styles.skinBackgroundColor;
-            GUI.DrawTexture(wrect, EditorGUIUtility.whiteTexture);
-            GUI.color = oldColor;
-
-
             GUILayout.BeginHorizontal(EditorStyles.toolbar);
             GUILayout.FlexibleSpace();
             if (GUILayout.Button(Styles.resetButtonContent, EditorStyles.toolbarButton))
@@ -513,8 +504,14 @@ void OnGUI()
 
                         using (var scrollScope = new EditorGUILayout.ScrollViewScope(m_ContentScroll))
                         {
+                            const float scrollViewTopMargin = 4f;
+                            GUILayout.Space(scrollViewTopMargin);
+                            
                             TraverseContainerGUI(selectedPanel);
                             m_ContentScroll = scrollScope.scrollPosition;
+                            
+                            const float scrollViewBottomMargin = 10f;
+                            GUILayout.Space(scrollViewBottomMargin);
                         }
                     }
 
@@ -567,8 +564,6 @@ void OnWidgetGUI(DebugUI.Widget widget)
                 return;
             }
 
-            GUILayout.Space(4);
-
             if (!s_WidgetDrawerMap.TryGetValue(widget.GetType(), out DebugUIDrawer drawer))
             {
                 foreach (var pair in s_WidgetDrawerMap)
@@ -635,8 +630,6 @@ public class Styles
             public readonly GUIStyle sectionScrollView = "PreferencesSectionBox";
             public readonly GUIStyle sectionElement = new GUIStyle("PreferencesSection");
             public readonly GUIStyle selected = "OL SelectedRow";
-            public readonly GUIStyle sectionHeader = new GUIStyle(EditorStyles.largeLabel);
-            public readonly Color skinBackgroundColor;
 
             public static GUIStyle centeredLeft = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleLeft };
             public static GUIStyle centeredLeftAlternate = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleLeft };
@@ -646,35 +639,23 @@ public class Styles
 
             public Styles()
             {
-                Color textColorDarkSkin = new Color32(210, 210, 210, 255);
-                Color textColorLightSkin = new Color32(102, 102, 102, 255);
-                Color backgroundColorDarkSkin = new Color32(38, 38, 38, 128);
-                Color backgroundColorLightSkin = new Color32(128, 128, 128, 96);
-
                 centeredLeftAlternate.normal.background = CoreEditorUtils.CreateColoredTexture2D(
                     EditorGUIUtility.isProSkin
                         ? new Color(63 / 255.0f, 63 / 255.0f, 63 / 255.0f, 255 / 255.0f)
-                        : new Color(202 / 255.0f, 202 / 255.0f, 202 / 255.0f, 255 / 255.0f),
+                        : new Color(211 / 255.0f, 211 / 255.0f, 211 / 255.0f, 211 / 255.0f),
                     "centeredLeftAlternate Background");
 
                 sectionScrollView = new GUIStyle(sectionScrollView);
                 sectionScrollView.overflow.bottom += 1;
 
                 sectionElement.alignment = TextAnchor.MiddleLeft;
 
-                sectionHeader.fontStyle = FontStyle.Bold;
-                sectionHeader.fontSize = 18;
-                sectionHeader.margin.top = 10;
-                sectionHeader.margin.left += 1;
-                sectionHeader.normal.textColor = EditorGUIUtility.isProSkin ? textColorDarkSkin : textColorLightSkin;
-                skinBackgroundColor = EditorGUIUtility.isProSkin ? backgroundColorDarkSkin : backgroundColorLightSkin;
-
                 labelWithZeroValueStyle.normal.textColor = Color.gray;
 
                 // Make sure that textures are unloaded on domain reloads.
                 void OnBeforeAssemblyReload()
                 {
-                    UnityEngine.Object.DestroyImmediate(centeredLeftAlternate.normal.background);
+                    DestroyImmediate(centeredLeftAlternate.normal.background);
                     AssemblyReloadEvents.beforeAssemblyReload -= OnBeforeAssemblyReload;
                 }
 

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Rendering;
+using UnityEngine.UIElements;
 
 namespace UnityEditor.Rendering
 {
@@ -182,7 +183,28 @@ public DefaultVolumeProfileEditor(Editor baseEditor, VolumeProfile profile)
         }
     }
 
+    public abstract partial class DefaultVolumeProfileSettingsPropertyDrawer
+    {        
+        /// <summary>
+        /// Context menu implementation for Default Volume Profile.
+        /// </summary>
+        /// <typeparam name="TSetting">Default Volume Profile Settings type</typeparam>
+        /// <typeparam name="TRenderPipeline">Render Pipeline type</typeparam>
+        [Obsolete("Use DefaultVolumeProfileSettingsPropertyDrawer<T>.DefaultVolumeProfileSettingsContextMenu2<TSetting, TRenderPipeline> instead #from(6000.0)")]
+        public abstract class DefaultVolumeProfileSettingsContextMenu<TSetting, TRenderPipeline> : IRenderPipelineGraphicsSettingsContextMenu<TSetting>
+            where TSetting : class, IDefaultVolumeProfileSettings
+            where TRenderPipeline : RenderPipeline
+        {
+            /// <summary>
+            /// Path where new Default Volume Profile will be created.
+            /// </summary>
+            [Obsolete("Not used anymore. #from(6000.0)")]
+            protected abstract string defaultVolumeProfilePath { get; }
 
+            [Obsolete("Not used anymore. #from(6000.0)")]
+            void IRenderPipelineGraphicsSettingsContextMenu<TSetting>.PopulateContextMenu(TSetting setting, PropertyDrawer property, ref GenericMenu menu){ }
+        }
+    }
 
     /// <summary>
     /// Builtin Drawer for Maskfield Debug Items.

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

@@ -232,8 +232,6 @@ void OnDisable()
             s_FilterWindow = null;
         }
 
-        void OnLostFocus() => Close();
-
         internal static bool ValidateAddComponentMenuItem()
         {
             return true;

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

@@ -945,8 +945,11 @@ internal static bool PrepareBaking()
 
         static bool InitializeBake()
         {
-            if (ProbeVolumeLightingTab.instance?.PrepareAPVBake() == false) return false;
-            if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP) return false;
+            if (ProbeVolumeLightingTab.instance?.PrepareAPVBake(ProbeReferenceVolume.instance) == false)
+                return false;
+
+            if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP)
+                return false;
 
             using var scope = new BakingSetupProfiling(BakingSetupProfiling.Stages.PrepareWorldSubdivision);
 
@@ -961,13 +964,16 @@ static bool InitializeBake()
                 }
             }
 
-            if (ProbeReferenceVolume.instance.perSceneDataList.Count == 0) return false;
+            if (ProbeReferenceVolume.instance.perSceneDataList.Count == 0)
+                return false;
 
             var sceneDataList = GetPerSceneDataList();
-            if (sceneDataList.Count == 0) return false;
+            if (sceneDataList.Count == 0)
+                return false;
 
             var pvList = GetProbeVolumeList();
-            if (pvList.Count == 0) return false; // We have no probe volumes.
+            if (pvList.Count == 0)
+                return false; // We have no probe volumes.
 
             CachePVHashes(pvList);
 
@@ -1491,11 +1497,14 @@ static void ApplyPostBakeOperations()
             if (m_BakingSet.hasDilation)
             {
                 // This subsequent block needs to happen AFTER we call WriteBakingCells.
-                // Otherwise in cases where we change the spacing between probes, we end up loading cells with a certain layout in ForceSHBand
+                // Otherwise, in cases where we change the spacing between probes, we end up loading cells with a certain layout in ForceSHBand
                 // And then we unload cells using the wrong layout in PerformDilation (after WriteBakingCells updates the baking set object) which leads to a broken internal state.
 
                 // Don't use Disk streaming to avoid having to wait for it when doing dilation.
                 probeRefVolume.ForceNoDiskStreaming(true);
+                // Increase the memory budget to make sure we can fit the current cell and all its neighbors when doing dilation.
+                var prevMemoryBudget = probeRefVolume.memoryBudget;
+                probeRefVolume.ForceMemoryBudget(ProbeVolumeTextureMemoryBudget.MemoryBudgetHigh);
                 // Force maximum sh bands to perform baking, we need to store what sh bands was selected from the settings as we need to restore it after.
                 var prevSHBands = probeRefVolume.shBands;
                 probeRefVolume.ForceSHBand(ProbeVolumeSHBands.SphericalHarmonicsL2);
@@ -1506,8 +1515,9 @@ static void ApplyPostBakeOperations()
                 using (new BakingCompleteProfiling(BakingCompleteProfiling.Stages.PerformDilation))
                     PerformDilation();
 
-                // Need to restore the original state
+                // Restore the original state.
                 probeRefVolume.ForceNoDiskStreaming(false);
+                probeRefVolume.ForceMemoryBudget(prevMemoryBudget);
                 probeRefVolume.ForceSHBand(prevSHBands);
             }
             else