Mirror Internal/master

Packages/com.unity.render-pipelines.core/Documentation~/UnifiedRayTracing/create-ray-tracing-context.md

@@ -35,7 +35,20 @@ rtResources.Load();
 ```
 **Note:** Since the Player doesn't give access to the Asset Database, this method only works in the Editor.
 
-To load the [`RayTracingResources`](xref:UnityEngine.Rendering.UnifiedRayTracing.RayTracingResources) in the Player, you can also build the **unifiedraytracing** AssetBundle. For more information about how to build and load AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
+To load the [`RayTracingResources`](xref:UnityEngine.Rendering.UnifiedRayTracing.RayTracingResources) in the Player, you can also build an AssetBundle that includes the following SRP Core files:
+- Runtime/UnifiedRayTracing/Common/GeometryPool/GeometryPoolKernels.compute
+- Runtime/UnifiedRayTracing/Common/Utilities/CopyBuffer.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/copyPositions.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/bit_histogram.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_reduce_part.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/block_scan.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/build_hlbvh.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/restructure_bvh.compute
+- Runtime/UnifiedRayTracing/Compute/RadeonRays/kernels/scatter.compute
+
+For more information about how to build and load AssetBundles, refer to [AssetBundles](xref:AssetBundlesIntro).
+
+Once the AssetBundle is built, you can load it using the following:
 ```C# 
 var rtResources = new RayTracingResources();
 

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

@@ -308,6 +308,7 @@ internal static string GetBakingMode(ProbeVolumeBakingSet bakingSet)
 
             internal static void SetBakingMode(ProbeVolumeBakingSet bakingSet, string mode)
             {
+                Undo.RecordObject(bakingSet, "Change Baking Mode");
                 bakingSet.singleSceneMode = (mode == "Single Scene");
             }
 
@@ -318,6 +319,7 @@ internal static int GetSkyOcclusionBakingSamples(ProbeVolumeBakingSet bakingSet)
 
             internal static void SetSkyOcclusionBakingSamples(ProbeVolumeBakingSet bakingSet, int samples)
             {
+                Undo.RecordObject(bakingSet, "Change Occlusion Baking");
                 bakingSet.skyOcclusionBakingSamples = samples;
             }
 
@@ -334,6 +336,7 @@ internal static void SetVolumeMode(GameObject go, string mode)
                 if (!go.TryGetComponent<Volume>(out var volume))
                     return;
 
+                Undo.RecordObject(volume, "Change Volume Mode");
                 volume.isGlobal = (mode == "Global");
             }
 
@@ -350,6 +353,7 @@ internal static void SetVolumeProfile(GameObject go, VolumeProfile profile)
                 if (!go.TryGetComponent<Volume>(out var volume))
                     return;
 
+                Undo.RecordObject(volume, "Change Volume Profile");
                 volume.sharedProfile = profile;
             }
 
@@ -368,6 +372,7 @@ internal static void SetLightShape(GameObject go, LightType value)
 
                 if (IsLightShapeApplicable(value))
                 {
+                    Undo.RecordObject(light, "Change light Shape");
                     light.type = value;
                 }
             }

Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputSerialization.cs

@@ -734,11 +734,11 @@ public static UInt64 TilingModeToLightmapExpandedBufferSize(TilingMode tilingMod
             // TODO: We need to change the naming of the entries in the enum see: https://jira.unity3d.com/browse/GFXFEAT-728
             switch (tilingMode)
             {
-                case TilingMode.None: bufferSize = 1048576; break;                     // UI: Highest Performance
-                case TilingMode.Quarter: bufferSize = 524288; break;                   // UI: High Performance
-                case TilingMode.Sixteenth: bufferSize = 262144; break;                 // UI: Automatic     (but it is not automatic)
-                case TilingMode.Sixtyfourth: bufferSize = 131072; break;               // UI: Low Memory Usage
-                case TilingMode.TwoHundredFiftySixth: bufferSize = 65536; break;       // UI: Lowest Memory Usage
+                case TilingMode.None: bufferSize = 2097152; break;                     // UI: Highest Performance
+                case TilingMode.Quarter: bufferSize = 1048576; break;                  // UI: High Performance
+                case TilingMode.Sixteenth: bufferSize = 524288; break;                 // UI: Automatic
+                case TilingMode.Sixtyfourth: bufferSize = 262144; break;               // UI: Low Memory Usage
+                case TilingMode.TwoHundredFiftySixth: bufferSize = 131072; break;      // UI: Lowest Memory Usage
                 default: Debug.Assert(false, "Unknown tiling mode."); break;
             }
             return math.max(bufferSize, kMinBufferSize);

Packages/com.unity.render-pipelines.core/Editor/PathTracing/BakeInputToWorldConversion.cs

@@ -319,7 +319,9 @@ static Vector2 GetPyramidLightRect(float coneAngleInRads, float pyramidAspectRad
 
         static float GetLightShadowRadius(UnityEngine.LightType lightType, in LightData lightData)
         {
-            return (Util.IsPunctualLightType(lightType) && lightType != UnityEngine.LightType.Pyramid && lightType != UnityEngine.LightType.Box) ? lightData.shape0 : 0.0f;
+            if (lightType == UnityEngine.LightType.Pyramid)
+                return lightData.shape1;  // For pyramid lights, shadow radius is in shape1 (shape0 is aspect ratio)
+            return (Util.IsPunctualLightType(lightType) && lightType != UnityEngine.LightType.Box) ? lightData.shape0 : 0.0f;
         }
 
         internal static void InjectEnvironmentLight(

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

@@ -38,15 +38,15 @@ public class FreeCamera : MonoBehaviour
         public float m_Turbo = 10.0f;
 
 #if !USE_INPUT_SYSTEM
-        private static string kMouseX = "Mouse X";
-        private static string kMouseY = "Mouse Y";
-        private static string kRightStickX = "Controller Right Stick X";
-        private static string kRightStickY = "Controller Right Stick Y";
-        private static string kVertical = "Vertical";
-        private static string kHorizontal = "Horizontal";
-
-        private static string kYAxis = "YAxis";
-        private static string kSpeedAxis = "Speed Axis";
+        private static readonly string kMouseX = "Mouse X";
+        private static readonly string kMouseY = "Mouse Y";
+        private static readonly string kRightStickX = "Controller Right Stick X";
+        private static readonly string kRightStickY = "Controller Right Stick Y";
+        private static readonly string kVertical = "Vertical";
+        private static readonly string kHorizontal = "Horizontal";
+
+        private static readonly string kYAxis = "YAxis";
+        private static readonly string kSpeedAxis = "Speed Axis";
 #endif
 
 #if USE_INPUT_SYSTEM

Packages/com.unity.render-pipelines.core/Runtime/CommandBuffers/CommandBufferHelpers.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.CompilerServices;
+using Unity.Scripting.LifecycleManagement;
 using UnityEngine.VFX;
 
 namespace UnityEngine.Rendering
@@ -9,8 +10,13 @@ namespace UnityEngine.Rendering
     /// </summary>
     public struct CommandBufferHelpers
     {
+        // These variables are just wrappers for the CommandBuffer supplied to methods below, so their state doesn't need
+        // to be reset when entering play mode.
+        [NoAutoStaticsCleanup]
         internal static RasterCommandBuffer rasterCmd = new RasterCommandBuffer(null, null, false);
+        [NoAutoStaticsCleanup]
         internal static ComputeCommandBuffer computeCmd = new ComputeCommandBuffer(null, null, false);
+        [NoAutoStaticsCleanup]
         internal static UnsafeCommandBuffer unsafeCmd = new UnsafeCommandBuffer(null, null, false);
 
         /// <summary>

Packages/com.unity.render-pipelines.core/Runtime/Common/CommandBufferPool.cs

@@ -10,6 +10,14 @@ public static class CommandBufferPool
     {
         static ObjectPool<CommandBuffer> s_BufferPool = new ObjectPool<CommandBuffer>(null, x => x.Clear());
 
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            s_BufferPool = new ObjectPool<CommandBuffer>(null, x => x.Clear());
+        }
+#endif
+
         /// <summary>
         /// Get a new Command Buffer.
         /// </summary>

Packages/com.unity.render-pipelines.core/Runtime/Common/ComponentSingleton.cs

@@ -1,5 +1,26 @@
+using System;
+using System.Collections.Generic;
+
 namespace UnityEngine.Rendering
 {
+#if UNITY_EDITOR
+    static class ComponentSingletonRegistry
+    {
+        static readonly List<Component> s_Instances = new();
+
+        internal static void Register(Component instance) => s_Instances.Add(instance);
+
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            foreach (var instance in s_Instances)
+                if (instance != null)
+                    CoreUtils.Destroy(instance.gameObject);
+            s_Instances.Clear();
+        }
+    }
+#endif
+
     // Use this class to get a static instance of a component
     // Mainly used to have a default instance
 
@@ -11,6 +32,7 @@ public static class ComponentSingleton<TType>
         where TType : Component
     {
         static TType s_Instance = null;
+
         /// <summary>
         /// Instance of the required component type.
         /// </summary>
@@ -28,6 +50,9 @@ public static TType instance
 
                     go.SetActive(false);
                     s_Instance = go.AddComponent<TType>();
+#if UNITY_EDITOR
+                    ComponentSingletonRegistry.Register(s_Instance);
+#endif
                 }
 
                 return s_Instance;

Packages/com.unity.render-pipelines.core/Runtime/Common/ConstantBuffer.cs

@@ -8,7 +8,15 @@ namespace UnityEngine.Rendering
     /// </summary>
     public class ConstantBuffer
     {
-        static List<ConstantBufferBase> m_RegisteredConstantBuffers = new List<ConstantBufferBase>();
+        static readonly List<ConstantBufferBase> m_RegisteredConstantBuffers = new List<ConstantBufferBase>();
+
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            ReleaseAll();
+        }
+#endif
 
         /// <summary>
         /// Update the GPU data of the constant buffer and bind it globally via a command buffer.

Packages/com.unity.render-pipelines.core/Runtime/Common/ContextContainer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Unity.Mathematics;
+using Unity.Scripting.LifecycleManagement;
 
 namespace UnityEngine.Rendering
 {
@@ -152,10 +153,14 @@ public void Dispose()
             m_ActiveItemIndices.Clear();
         }
 
+        // Static s_TypeCount and TypeId<T>.value fields don't need to be reset when entering playmode.
+        // s_TypeCount is only incremented by the static initialization of TypeId<T>.value.
+        [NoAutoStaticsCleanup]
         static uint s_TypeCount;
 
         static class TypeId<T>
         {
+            [NoAutoStaticsCleanup]
             public static uint value = s_TypeCount++;
         }
 

Packages/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs

@@ -627,5 +627,26 @@ public float GetLowResMultiplier(float targetLowRes, float minimumThreshold)
 
             return Mathf.Clamp(thresholdPercentage / m_CurrentFraction, 0.0f, 1.0f);
         }
+
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            s_ActiveScalerSlot = DynamicResScalerSlot.User;
+            s_ScalerContainers = new ScalerContainer[(int)DynamicResScalerSlot.Count]
+            {
+                new ScalerContainer() { type = DynamicResScalePolicyType.ReturnsMinMaxLerpFactor, method = DefaultDynamicResMethod },
+                new ScalerContainer() { type = DynamicResScalePolicyType.ReturnsMinMaxLerpFactor, method = DefaultDynamicResMethod }
+            };
+            s_CameraUpscaleFilters = new Dictionary<EntityId, DynamicResUpscaleFilter>();
+            s_CameraInstances = new Dictionary<EntityId, DynamicResolutionHandler>(CameraDictionaryMaxcCapacity);
+            s_DefaultInstance = new DynamicResolutionHandler();
+            s_ActiveCameraId = EntityId.None;
+            s_ActiveInstance = s_DefaultInstance;
+            s_ActiveInstanceDirty = true;
+            s_GlobalHwFraction = 1.0f;
+            s_GlobalHwUpresActive = false;
+        }
+#endif
     }
 }

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

@@ -429,7 +429,7 @@ internal static DebugUI.Widget CreateVolumeParameterWidget(string name, bool isR
                 return new DebugUI.Value() { displayName = name, getter = () => Strings.parameterNotCalculated, };
             }
 
-            static DebugUI.Value s_EmptyDebugUIValue = new DebugUI.Value { getter = () => string.Empty };
+            static readonly DebugUI.Value s_EmptyDebugUIValue = new DebugUI.Value { getter = () => string.Empty };
 
             struct VolumeParameterChain
             {

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

@@ -6,6 +6,14 @@ public partial class DebugShapes
         // Singleton
         static DebugShapes s_Instance = null;
 
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            s_Instance = null;
+        }
+#endif
+
         /// <summary>Singleton instance</summary>
         static public DebugShapes instance
         {

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

@@ -782,7 +782,7 @@ public int[] enumValues
 
 
             // Space-delimit PascalCase (https://stackoverflow.com/questions/155303/net-how-can-you-split-a-caps-delimited-string-into-an-array)
-            static Regex s_NicifyRegEx = new("([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-z]))", RegexOptions.Compiled);
+            static readonly Regex s_NicifyRegEx = new("([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-z]))", RegexOptions.Compiled);
 
             /// <summary>
             /// Automatically fills the enum names with a given <see cref="Type"/>
@@ -1040,6 +1040,41 @@ public CameraSelector()
             private Camera[] m_CamerasArray;
             private List<Camera> m_Cameras = new List<Camera>();
 
+#if ENABLE_RENDERING_DEBUGGER_UI
+            /// <inheritdoc/>
+            protected override VisualElement Create()
+            {
+                var objectPopUpField = base.Create() as UIElements.PopupField<UnityEngine.Object>;
+
+                if (objectPopUpField == null)
+                    return new Label("Error creating CameraSelector field");
+
+                objectPopUpField.choices ??= new List<UnityEngine.Object>() { null };
+
+                // Refresh the dropdown choices to keep it in sync with available cameras in the scene.
+                // NOTE: If the currently selected camera is deleted, PopupField handles it internally,
+                //       so we only need to maintain the available choices list.
+                this.ScheduleTracked(objectPopUpField, () => objectPopUpField.schedule.Execute(() =>
+                {
+                    // Using ListPool and SequenceEqual to avoid unnecessary allocations and UI updates
+                    using (UnityEngine.Pool.ListPool<UnityEngine.Object>.Get(out var tmp))
+                    {
+                        tmp.Add(null);
+                        tmp.AddRange(getObjects());
+
+                        if (!tmp.SequenceEqual(objectPopUpField.choices))
+                        {
+                            objectPopUpField.choices.Clear();
+                            objectPopUpField.choices.AddRange(tmp);
+                        }
+                    }
+
+                }).Every(500));
+
+                return objectPopUpField;
+            }
+#endif
+
             IEnumerable<Camera> cameras
             {
                 get

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

@@ -308,22 +308,19 @@ internal VisualElement ToVisualElement(Context context)
                 m_Context = context;
                 m_VisualElement = Create();
 
-                //Debug.Log($"ToVisualElement for {queryPath}");
-
                 if (m_VisualElement == null)
                 {
                     Debug.LogWarning($"Unable to create a Visual Element for type {GetType()}");
                     return null;
                 }
                 m_VisualElement.AddToClassList("unity-inspector-element");
-
+                m_VisualElement.name = displayName;
 
 #if UNITY_EDITOR
                 // Support for legacy state handling
                 if (this is ISupportsLegacyStateHandling legacyStateWidget)
                 {
                     m_RequiresLegacyStateHandling = legacyStateWidget.RequiresLegacyStateHandling();
-                    //Debug.Log($"LegacyState: {m_RequiresLegacyStateHandling} ({queryPath})");
                 }
 #endif
 

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

@@ -71,6 +71,14 @@ static void DisableRuntime()
 #if !USE_INPUT_SYSTEM
         static DebugUpdater s_Instance = null;
 
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+        static void ResetStaticsOnLoad()
+        {
+            s_Instance = null;
+        }
+#endif
+
         void Update()
         {
             DebugManager debugManager = DebugManager.instance;