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

Internal/master

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/.buginfo

@@ -1,5 +1,5 @@
 rule1:
-  area: SRP Architecture & API
+  area: SRP Foundation
 
 rule2:
   when:

Packages/com.unity.render-pipelines.core/Documentation~/Images/srp-vrs-example.jpg

@@ -6,7 +6,7 @@ If your project uses a custom Scriptable Render Pipeline (SRP), you can add cont
 
 If your project uses the Universal Render Pipeline (URP) or the High-Definition Render Pipeline (HDRP), refer to the following pages:
 
-- [Add controls to the Rendering Debugger in URP](https://docs.unity3d.com/Packages/[email protected]/manual/features/rendering-debugger-add-controls.html)
+- [Add controls to the Rendering Debugger in URP](https://docs.unity3d.com/Manual/urp/features/rendering-debugger-add-controls.html)
 - [Add controls to the Rendering Debugger in HDRP](https://docs.unity3d.com/Packages/[email protected]/manual/Rendering-Debugger-Add-Controls.html)
 
 ## How to access the Rendering Debugger

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

@@ -2,6 +2,7 @@
 * [What's new](whats-new.md)
   * [12](whats-new-12.md)
   * [13](whats-new-13.md)
+  * [17](whats-new-17.md)
 * [Creating a custom render pipeline](srp-custom.md)
   * [Create a custom Scriptable Render Pipeline](srp-custom-getting-started.md)
   * [Create a Render Pipeline Asset and Render Pipeline Instance in a custom render pipeline](srp-creating-render-pipeline-asset-and-render-pipeline-instance.md)

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

@@ -8,7 +8,7 @@ The request is processed sequentially in your script, so there's no callback inv
 
 `RenderPipeline.StandardRequest` renders the following:
 
-* A full stack of cameras in the [Universal Render Pipeline](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest/index.html) (URP).
+* A full stack of cameras in the [Universal Render Pipeline](https://docs.unity3d.com/Manual/urp/urp-introduction.html) (URP).
 * A single camera in the [High Definition Render Pipeline](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest/index.html) (HDRP).
 
 The following code sample gets the output of the scriptable render pipeline when you select a GUI button. Attach the script to a camera and select **Enter Play Mode**.
@@ -91,4 +91,4 @@ public class StandardRenderRequest : MonoBehaviour
 
 ## Other useful information
 
-* On [Universal Render Pipeline (URP)](https://docs.unity3d.com/Packages/[email protected]/manual/User-Render-Requests.html).
+* On [Universal Render Pipeline (URP)](https://docs.unity3d.com/Manual/urp/User-Render-Requests.html).

Packages/com.unity.render-pipelines.core/Documentation~/User-Render-Requests.md

@@ -4,7 +4,7 @@ Render from cameras nested inside the render loop of other cameras.
 
 Attach the provided script to a GameObject with a Camera component to nest multiple cameras, that are rendering with [RenderPipeline.SubmitRenderRequest](https://docs.unity3d.com/6000.0/Documentation/ScriptReference/Rendering.RenderPipeline.SubmitRenderRequest.html), inside the render loop of other cameras.
 
-**Note**: If your project uses the [Universal Render Pipeline](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest/index.html) (URP), the recommended best practice is to use [UniversalRenderPipeline.SingleCameraRequest](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@17.0/api/UnityEngine.Rendering.Universal.UniversalRenderPipeline.SingleCameraRequest.html) instead of [StandardRequest](https://docs.unity3d.com/6000.0/Documentation/ScriptReference/Rendering.RenderPipeline.StandardRequest.html), to make sure you only render the camera provided to the `RenderRequest` API instead of the full stack of cameras.
+**Note**: If your project uses the [Universal Render Pipeline](https://docs.unity3d.com/Manual/urp/urp-introduction.html) (URP), the recommended best practice is to use [UniversalRenderPipeline.SingleCameraRequest](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@17.2/api/UnityEngine.Rendering.Universal.UniversalRenderPipeline.SingleCameraRequest.html) instead of [StandardRequest](https://docs.unity3d.com/6000.0/Documentation/ScriptReference/Rendering.RenderPipeline.StandardRequest.html), to make sure you only render the camera provided to the `RenderRequest` API instead of the full stack of cameras.
 
 ## Attach the script to nest 
 

Packages/com.unity.render-pipelines.core/Documentation~/in-loop-render-requests.md

@@ -6,4 +6,4 @@ SRP Core contains reusable code, including boilerplate code for working with pla
 
 If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.
 
-For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest).
+For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Manual/urp/urp-introduction.html), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest).

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

@@ -1,6 +1,22 @@
-# What's new in SRP Core version 17 / Unity 6
+# 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.
 
-This page contains an overview of new features, improvements, and issues resolved in version 17 of the Scriptable Render Pipeline (SRP) Core package, embedded in Unity 6.
+## Added
+### Disable pass merging in the render graph system
+Added a render graph debug setting that allows you to temporarily disable pass merging to isolate issues or investigate performance changes.
+
+### New variable rate shading (VRS) API
+You can use the new variable rate shading (VRS) API to control the shading rate of Scriptable Renderer Features, and balance between GPU performance and image quality. This API is supported on DirectX 12, Vulkan, and compatible consoles.
+
+VRS is also known as fragment shading rate, and is a technique which allows you to decouple the rasterization and pixel shading rate. VRS can vary the shading rate across the screen space by using a shading rate image, which encodes the shading rates for different regions of the screen at different rates. When setting a lower shading rate, the pixel shader will execute at a lower frequency, which can drastically improve GPU performance.
+
+![A scene with a shading rate image (SRI) in the corner. The blue and red areas represent the different shading rates of the UI and the game visuals.](Images/srp-vrs-example.jpg)
+
+For more information about VRS, refer to the [Optimize Renderer Features with Variable Rate Shading in Unity 6.1](https://discussions.unity.com/t/optimize-renderer-features-with-variable-rate-shading-in-unity-6-1/1605893/1) Unity Discussions page.
+
+## What's new in SRP Core version 17.0 / Unity 6.0
+
+The following is an overview of new features, improvements, and issues resolved in version 17 of the Scriptable Render Pipeline (SRP) Core package, embedded in Unity 6.
 
 ## Improvements
 

Packages/com.unity.render-pipelines.core/Documentation~/whats-new-17.md

@@ -1,5 +1,5 @@
 rule1:
-  area: SRP Architecture & API
+  area: SRP Foundation
 
 rule2:
   when:
@@ -10,15 +10,20 @@ rule2:
 rule3:
   when:
     path:
-      - ^.*Camera.*$
       - ^.*ContextualMenuDispatcher.*$
       - ^.*CoreRenderPipelinePreferences.*$
       - ^.*InspectorCurveEditor.*$
       - ^.*RemoveAdditionalDataUtils.*$
-  area: SRP Workflow
-  
+  area: SRP Settings
+
 rule4:
   when:
     path:
       - ^.*Upgrader.*$
-  area: Graphics Tools
+  area: Graphics Tools
+
+rule5:
+  when:
+    path:
+      - ^.*CameraEditorUtils.*$
+  area: Camera

Packages/com.unity.render-pipelines.core/Editor/.buginfo

@@ -1 +1 @@
-area: SRP Workflow
+area: Camera

Packages/com.unity.render-pipelines.core/Editor/Camera/.buginfo

@@ -1 +1 @@
-area: Graphics Tools
+area: Graphics Debugging Tools

Packages/com.unity.render-pipelines.core/Editor/Debugging/.buginfo

@@ -237,9 +237,15 @@ public override void SetValue(object value, DebugUI.IValueField field)
     /// <summary>
     /// Unsigned Integer Debug State.
     /// </summary>
-    [Serializable, DebugState(typeof(DebugUI.UIntField), typeof(DebugUI.MaskField))]
+    [Serializable, DebugState(typeof(DebugUI.UIntField))]
     public sealed class DebugStateUInt : DebugState<uint> { }
 
+    /// <summary>
+    /// Rendering layer mask state.
+    /// </summary>
+    [Serializable, DebugState(typeof(DebugUI.RenderingLayerField))]
+    public sealed class DebugStateRenderingLayer : DebugState<RenderingLayerMask> { }
+
     /// <summary>
     /// Float Debug State.
     /// </summary>

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

@@ -424,12 +424,11 @@ protected override Enum DoGUI(Rect rect, GUIContent label, DebugUI.BitField fiel
         }
     }
 
-
     /// <summary>
     /// Builtin Drawer for Maskfield Debug Items.
     /// </summary>
-    [DebugUIDrawer(typeof(DebugUI.MaskField))]
-    public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.MaskField, DebugStateUInt>
+    [DebugUIDrawer(typeof(DebugUI.RenderingLayerField))]
+    public sealed class DebugUIDrawerRenderingLayerField : DebugUIFieldDrawer<RenderingLayerMask, DebugUI.RenderingLayerField, DebugStateRenderingLayer>
     {
         /// <summary>
         /// Does the field of the given type
@@ -439,15 +438,10 @@ public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.Ma
         /// <param name="field">The field</param>
         /// <param name="state">The state</param>
         /// <returns>The current value from the UI</returns>
-        protected override uint DoGUI(Rect rect, GUIContent label, DebugUI.MaskField field, DebugStateUInt state)
+        protected override RenderingLayerMask DoGUI(Rect rect, GUIContent label, DebugUI.RenderingLayerField field, DebugStateRenderingLayer state)
         {
             uint value = field.GetValue();
-
-            var enumNames = new string[field.enumNames.Length];
-            for (int i = 0; i < enumNames.Length; i++)
-                enumNames[i] = field.enumNames[i].text;
-            var mask = EditorGUI.MaskField(rect, label, (int)value, enumNames);
-
+            var mask = EditorGUI.MaskField(rect, label, (int)value, field.renderingLayersNames);
             return (uint)mask;
         }
     }
@@ -859,7 +853,7 @@ public override bool OnGUI(DebugUI.Widget widget, DebugState state)
 
                     bool isAlternate = r % 2 == 0;
 
-                    EditorGUI.LabelField(rowRect, GUIContent.none, EditorGUIUtility.TrTextContent(row.displayName),isAlternate ? DebugWindow.Styles.centeredLeft : DebugWindow.Styles.centeredLeftAlternate);
+                    EditorGUI.LabelField(rowRect, GUIContent.none, EditorGUIUtility.TrTextContent(row.displayName), isAlternate ? DebugWindow.Styles.centeredLeft : DebugWindow.Styles.centeredLeftAlternate);
                     rowRect.xMin -= 2;
                     rowRect.xMax += 2;
 

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

@@ -60,7 +60,7 @@ void OnEnable()
                 {
                     var prefab = list.serializedProperty.GetArrayElementAtIndex(list.index).FindPropertyRelative("prefab").objectReferenceValue as GameObject;
                     if (prefab)
-                        EditorGUIUtility.PingObject(prefab.gameObject);
+                        EditorGUIUtility.PingObject(prefab);
                 }
             };
         }

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

@@ -43,7 +43,7 @@ void OnEnable()
             hideFlags = HideFlags.HideAndDontSave;
         }
     }
-    
+
     [CoreRPHelpURL("Rendering-Debugger")]
     sealed class DebugWindow : EditorWindowWithHelpButton, IHasCustomMenu
     {
@@ -271,17 +271,17 @@ DebugState GetOrCreateDebugStateForValueField(DebugUI.Widget widget)
             if (widget is not DebugUI.IValueField valueField)
                 return null;
 
-            string guid = widget.queryPath;
-            if (!m_WidgetStates.TryGetValue(guid, out var state) || state == null)
+            string queryPath = widget.queryPath;
+            if (!m_WidgetStates.TryGetValue(queryPath, out var state) || state == null)
             {
                 var widgetType = widget.GetType();
                 if (s_WidgetStateMap.TryGetValue(widgetType, out Type stateType))
                 {
                     Assert.IsNotNull(stateType);
                     state = (DebugState)CreateInstance(stateType);
-                    state.queryPath = guid;
+                    state.queryPath = queryPath;
                     state.SetValue(valueField.GetValue(), valueField);
-                    m_WidgetStates[guid] = state;
+                    m_WidgetStates[queryPath] = state;
                 }
             }
 
@@ -312,15 +312,20 @@ void UpdateWidgetStates(DebugUI.IContainer container)
 
         public void ApplyStates(bool forceApplyAll = false)
         {
+            // If we are in playmode, and the runtime UI is shown, avoid that the editor UI
+            // applies the data of the internal debug states, as they are not kept in sync
+            if (Application.isPlaying && DebugManager.instance.displayRuntimeUI)
+                return;
+
             if (!forceApplyAll && DebugState.m_CurrentDirtyState != null)
             {
                 ApplyState(DebugState.m_CurrentDirtyState.queryPath, DebugState.m_CurrentDirtyState);
-                DebugState.m_CurrentDirtyState = null;
-                return;
             }
-
-            foreach (var state in m_WidgetStates)
-                ApplyState(state.Key, state.Value);
+            else
+            {
+                foreach (var state in m_WidgetStates)
+                    ApplyState(state.Key, state.Value);
+            }
 
             DebugState.m_CurrentDirtyState = null;
         }
@@ -382,6 +387,8 @@ void Update()
                 UpdateWidgetStates();
                 ApplyStates();
                 m_IsDirty = false;
+
+                Repaint();
             }
         }
 
@@ -488,22 +495,22 @@ void OnGUI()
                     using (new EditorGUILayout.VerticalScope())
                     {
                         var selectedPanel = panels[m_Settings.selectedPanel];
-                        
+
                         using (new EditorGUILayout.HorizontalScope())
                         {
                             var style = new GUIStyle(CoreEditorStyles.sectionHeaderStyle) { fontStyle = FontStyle.Bold };
                             EditorGUILayout.LabelField(new GUIContent(selectedPanel.displayName), style);
-                            
+
                             // Context menu
                             var rect = GUILayoutUtility.GetLastRect();
                             var contextMenuRect = new Rect(rect.xMax, rect.y + 4f, 16f, 16f);
-                            
+
                             CoreEditorUtils.ShowHelpButton(contextMenuRect, selectedPanel.documentationUrl, new GUIContent($"{selectedPanel.displayName} panel."));
                         }
 
                         const float leftMargin = 4f;
                         GUILayout.Space(leftMargin);
-                        
+
                         using (var scrollScope = new EditorGUILayout.ScrollViewScope(m_ContentScroll))
                         {
                             TraverseContainerGUI(selectedPanel);
@@ -554,6 +561,12 @@ void OnWidgetGUI(DebugUI.Widget widget)
             if (widget.isInactiveInEditor || widget.isHidden)
                 return;
 
+            if (widget.queryPath == null)
+            {
+                Debug.LogError($"Widget {widget.GetType()} query path is null");
+                return;
+            }
+
             GUILayout.Space(4);
 
             if (!s_WidgetDrawerMap.TryGetValue(widget.GetType(), out DebugUIDrawer drawer))

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

@@ -181,4 +181,34 @@ public DefaultVolumeProfileEditor(Editor baseEditor, VolumeProfile profile)
             m_TargetSerializedObject = baseEditor.serializedObject;
         }
     }
+
+
+
+    /// <summary>
+    /// Builtin Drawer for Maskfield Debug Items.
+    /// </summary>
+    [DebugUIDrawer(typeof(DebugUI.MaskField))]
+    [Obsolete("DebugUI.MaskField has been deprecated and is not longer supported, please use BitField instead. #from(6000.2)", false)]
+    public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.MaskField, DebugStateUInt>
+    {
+        /// <summary>
+        /// Does the field of the given type
+        /// </summary>
+        /// <param name="rect">The rect to draw the field</param>
+        /// <param name="label">The label for the field</param>
+        /// <param name="field">The field</param>
+        /// <param name="state">The state</param>
+        /// <returns>The current value from the UI</returns>
+        protected override uint DoGUI(Rect rect, GUIContent label, DebugUI.MaskField field, DebugStateUInt state)
+        {
+            uint value = field.GetValue();
+
+            var enumNames = new string[field.enumNames.Length];
+            for (int i = 0; i < enumNames.Length; i++)
+                enumNames[i] = field.enumNames[i].text;
+            var mask = EditorGUI.MaskField(rect, label, (int)value, enumNames);
+
+            return (uint)mask;
+        }
+    }
 }

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

@@ -1 +1 @@
-area: SRP Workflow
+area: Graphics Tools

Packages/com.unity.render-pipelines.core/Editor/Gizmo/.buginfo

@@ -128,7 +128,7 @@ public void DrawHull(bool filled)
                 if (filled)
                 {
                     material.SetPass(0);
-                    Matrix4x4 drawMatrix = Matrix4x4.TRS((Vector3)Handles.matrix.GetColumn(3), Quaternion.identity, Vector3.one * radius * 2f);
+                    Matrix4x4 drawMatrix = Matrix4x4.TRS((Vector3)Handles.matrix.GetColumn(3), Quaternion.identity, 2f * radius * Vector3.one);
                     Graphics.DrawMeshNow(k_MeshSphere, drawMatrix);
                 }
 

Packages/com.unity.render-pipelines.core/Editor/Gizmo/HierarchicalSphere.cs

@@ -1 +1,7 @@
-area: SRP Workflow
+area: SRP Settings
+
+graphic-tools:
+  when:
+    path:
+      - ^.*RenderGraphViewer.*$
+  area: Graphics Debugging Tools