Internal/6000.2/staging

.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/CHANGELOG.md

@@ -12,7 +12,7 @@ The version number for this package has increased due to a version update of a r
 
 ## [17.0.3] - 2025-02-13
 
-This version is compatible with Unity 6000.2.0a17.
+This version is compatible with Unity 6000.2.0a5.
 
 ### Added
 - Added Variable Rate Shading API support for (Raster)CommandBuffer(s), RenderGraph and RTHandles.

Packages/com.unity.render-pipelines.core/Documentation~/advanced-properties.md

@@ -14,7 +14,7 @@ There is a global state per user that stores if Unity displays **advanced proper
 Not every component or Volume Override includes advanced properties.
 If one does, it has a contextual menu to the right of each property section header that includes additional properties. To expose advanced properties for that section, open the contextual menu and click **Advanced Properties**.
 
-For an example, see the **Water Surface** component in [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest).
+For an example, refer to the **Water Surface** component in [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest?subfolder=/manual/settings-and-properties-related-to-the-water-system.html).
 
 By default only standard properties are shown.
 

Packages/com.unity.render-pipelines.core/Documentation~/api_index.md

@@ -0,0 +1,12 @@
+---
+uid: srp-core-api-index
+---
+
+# Scriptable Render Pipeline Core scripting API
+
+This is the documentation for the scripting APIs of the Scriptable Render Pipeline (SRP) Core package.
+
+**Note**:  URP and HDRP are built on the Scriptable Render Pipeline (SRP) Core package, but have their own class types. For more information, refer to the following:
+
+- [Universal Render Pipeline (URP) Scripting API](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@17.2/api/index.html)
+- [High Definition Render Pipeline (HDRP) Scripting API](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@17.2/api/index.html)

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/Documentation~/whats-new-17.md

@@ -1,4 +1,8 @@
-# What's new in SRP Core 17.1 / Unity 6.1
+# What's new in SRP Core 17 / Unity 6
+
+**Note:** Starting with 17.2 (Unity 6.2), refer to [What’s new in Unity](xref:um-whats-new) for the latest updates and improvements.
+
+## What's new in SRP Core 17.1 / Unity 6.1
 The following are the new features and improvements added to the SRP Core package 17.1, embedded Unity 6.1.
 
 ## Added

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs

@@ -19,11 +19,6 @@ public class CoreBuildData : IDisposable
         /// </summary>
         public static CoreBuildData instance => m_Instance ??= CreateInstance();
 
-        /// <summary>
-        /// Returns if the build is done for debug
-        /// </summary>
-        public bool isDevelopmentBuild { get; set; }
-
         /// <summary>
         /// If the target build has an SRP configured
         /// </summary>
@@ -44,32 +39,24 @@ public class CoreBuildData : IDisposable
         internal bool pipelineSupportGPUResidentDrawer { get; private set; } = false;
         internal bool playerNeedGPUResidentDrawer { get; private set; } = false;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CoreBuildData"/> class for the core library.
-        /// This constructor may also be invoked when building Asset Bundles.
-        /// </summary>
-        /// <param name="buildTarget">The target platform for the build (e.g., Standalone, iOS, Android).</param>
-        /// <param name="isDevelopmentBuild">Indicates whether the build is a development build. If true, the build includes debugging and logging features.</param>
-        public CoreBuildData(BuildTarget buildTarget, bool isDevelopmentBuild)
-
+        private CoreBuildData(BuildTarget buildTarget)
         {
-            if (buildTarget.TryGetRenderPipelineAssets(renderPipelineAssets))
-            {
-                buildingPlayerForRenderPipeline = true;
+            m_Instance = this;
+
+            if (!buildTarget.TryGetRenderPipelineAssets(renderPipelineAssets))
+                return;
 
-                //We can check only the first as we don't support multiple pipeline type in player
-                var asset = renderPipelineAssets[0];
-                currentRenderPipelineAssetType = asset.GetType();
+            buildingPlayerForRenderPipeline = true;
 
-                CheckGPUResidentDrawerUsage();
-            }
+            //We can check only the first as we don't support multiple pipeline type in player
+            var asset = renderPipelineAssets[0];
+            currentRenderPipelineAssetType = asset.GetType();
 
-            this.isDevelopmentBuild = isDevelopmentBuild;
-            m_Instance = this;
+            CheckGPUResidentDrawerUsage();
         }
 
         private static CoreBuildData CreateInstance()
-            => new(EditorUserBuildSettings.activeBuildTarget, Debug.isDebugBuild);
+            => new(EditorUserBuildSettings.activeBuildTarget);
 
         private void CheckGPUResidentDrawerUsage()
         {

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CorePreprocessBuild.cs

@@ -3,7 +3,7 @@
 
 namespace UnityEditor.Rendering
 {
-    // Make CoreBuildData constructed and keep the instance until the end of build
+    //Make CoreBuildData constructed and kept till end of build
     class CorePreprocessBuild : IPreprocessBuildWithReport, IPostprocessBuildWithReport
     {
         int IOrderedCallback.callbackOrder => int.MinValue + 50;
@@ -13,8 +13,7 @@ class CorePreprocessBuild : IPreprocessBuildWithReport, IPostprocessBuildWithRep
         void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report)
         {
             m_BuildData?.Dispose();
-            bool isDevelopmentBuild = (report.summary.options & BuildOptions.Development) != 0;
-            m_BuildData = new CoreBuildData(EditorUserBuildSettings.activeBuildTarget, isDevelopmentBuild);
+            m_BuildData = CoreBuildData.instance;
         }
 
         void IPostprocessBuildWithReport.OnPostprocessBuild(BuildReport report)

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

@@ -118,6 +118,8 @@ public static GUIStyle miniLabelButton
 
         /// <summary> Warning icon </summary>
         public static readonly Texture2D iconWarn;
+        /// <summary> Info icon </summary>
+        public static readonly Texture2D iconInfo;
         /// <summary> Help icon </summary>
         public static readonly Texture2D iconHelp;
         /// <summary> Fail icon </summary>
@@ -144,7 +146,7 @@ internal static Texture2D GetMessageTypeIcon(MessageType messageType)
                 case MessageType.None:
                     return null;
                 case MessageType.Info:
-                    return iconHelp;
+                    return iconInfo;
                 case MessageType.Warning:
                     return iconWarn;
                 case MessageType.Error:
@@ -215,7 +217,8 @@ static CoreEditorStyles()
             greenTexture = CoreEditorUtils.CreateColoredTexture2D(Color.green, "Green 1x1");
             blueTexture = CoreEditorUtils.CreateColoredTexture2D(Color.blue, "Blue 1x1");
 
-            iconHelp = CoreEditorUtils.LoadIcon("icons", "console.infoicon", ".png");
+            iconHelp = CoreEditorUtils.LoadIcon("icons", "_Help", ".png");
+            iconInfo = CoreEditorUtils.LoadIcon("icons", "console.infoicon", ".png");
             iconWarn = CoreEditorUtils.LoadIcon("icons", "console.warnicon", ".png");
             iconFail = CoreEditorUtils.LoadIcon("icons", "console.erroricon", ".png");
             iconSuccess = EditorGUIUtility.FindTexture("TestPassed");

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

@@ -179,7 +179,7 @@ public sealed class DebugStateInt : DebugState<int> { }
     /// <summary>
     /// Object Debug State.
     /// </summary>
-    [Serializable, DebugState(typeof(DebugUI.ObjectPopupField), typeof(DebugUI.CameraSelector))]
+    [Serializable, DebugState(typeof(DebugUI.ObjectPopupField), typeof(DebugUI.CameraSelector), typeof(DebugUI.ObjectField))]
     public sealed class DebugStateObject : DebugState<UnityEngine.Object>
     {
         /// <summary>

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);