Merge pull request #8117 from Unity-Technologies/internal/6000.0/staging

Internal/6000.0/staging

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/Documentation~/render-graph-writing-a-render-pipeline.md

@@ -7,6 +7,7 @@ This page covers the process of how to use the RenderGraph API to write a render
 To begin, your render pipeline needs to maintain at least one instance of [RenderGraph](../api/UnityEngine.Rendering.RenderGraphModule.RenderGraph.html). This is the main entry point for the API. You can use more than one instance of a render graph, but be aware that Unity does not share resources across `RenderGraph` instances so for optimal memory usage, only use one instance.
 
 ```c#
+using UnityEngine.Rendering;
 using UnityEngine.Rendering.RenderGraphModule;
 
 public class MyRenderPipeline : RenderPipeline
@@ -21,8 +22,11 @@ public class MyRenderPipeline : RenderPipeline
     void CleanupRenderGraph()
     {
         m_RenderGraph.Cleanup();
-          m_RenderGraph = null;
+        m_RenderGraph = null;
     }
+
+    ...
+
 }
 ```
 

Packages/com.unity.render-pipelines.core/Editor/Settings/PropertyDrawers/DefaultVolumeProfileSettingsPropertyDrawer.cs

@@ -88,18 +88,23 @@ protected void CreateDefaultVolumeProfileEditor()
             }
             m_EditorContainer.Add(s_DefaultVolumeProfileEditor.Create());
             m_EditorContainer.Q<HelpBox>("volume-override-info-box").text = volumeInfoBoxLabel.text;
+
+            if (m_DefaultVolumeProfileFoldoutExpanded.value)
+                m_EditorContainer.style.display = DisplayStyle.Flex;
         }
 
         /// <summary>
         /// Destroys the Default Volume Profile editor.
         /// </summary>
         protected void DestroyDefaultVolumeProfileEditor()
         {
+            m_EditorContainer.style.display = DisplayStyle.None;
+            m_EditorContainer?.Clear();
+
             if (s_DefaultVolumeProfileEditor != null)
                 s_DefaultVolumeProfileEditor.Destroy();
             s_DefaultVolumeProfileEditor = null;
             s_DefaultVolumeProfileSerializedProperty = null;
-            m_EditorContainer?.Clear();
         }
 
         /// <summary>
@@ -124,8 +129,6 @@ public abstract class DefaultVolumeProfileSettingsContextMenu<TSetting, TRenderP
 
             void IRenderPipelineGraphicsSettingsContextMenu<TSetting>.PopulateContextMenu(TSetting setting, PropertyDrawer _, ref GenericMenu menu)
             {
-                menu.AddSeparator("");
-
                 bool canCreateNewAsset = RenderPipelineManager.currentPipeline is TRenderPipeline;
                 VolumeProfileUtils.AddVolumeProfileContextMenuItems(ref menu,
                     setting.volumeProfile,

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeProfileUtils.cs

@@ -240,8 +240,6 @@ public static void EnsureAllOverridesForDefaultProfile(VolumeProfile profile, Vo
             {
                 VolumeManager.instance.OnVolumeProfileChanged(profile);
                 EditorUtility.SetDirty(profile);
-                AssetDatabase.SaveAssets();
-                AssetDatabase.Refresh();
             }
         }
 

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Debug.cs

@@ -1089,6 +1089,9 @@ CellInstancedDebugProbes CreateInstancedProbes(Cell cell)
             if (cell.debugProbes != null)
                 return cell.debugProbes;
 
+            if (HasActiveStreamingRequest(cell))
+                return null;
+                
             int maxSubdiv = GetMaxSubdivision() - 1;
 
             if (!cell.data.bricks.IsCreated || cell.data.bricks.Length == 0 || !cell.data.probePositions.IsCreated || !cell.loaded)

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Streaming.cs

@@ -1450,6 +1450,11 @@ void UpdateDiskStreaming(CommandBuffer cmd)
             }
         }
 
+        bool HasActiveStreamingRequest(Cell cell)
+        {
+            return diskStreamingEnabled && m_ActiveStreamingRequests.Exists(x => x.cell == cell);
+        }
+
         [Conditional("UNITY_EDITOR")]
         [Conditional("DEVELOPMENT_BUILD")]
         void LogStreaming(string log)

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/CompilerContextData.cs

@@ -98,7 +98,7 @@ public ref ResourceVersionedData VersionedResourceData(ResourceHandle h)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public ReadOnlySpan<ResourceReaderData> Readers(ResourceHandle h)
         {
-            int firstReader = ResourcesData.IndexReader(h, 0);
+            int firstReader = resources.IndexReader(h, 0);
             int numReaders = resources[h].numReaders;
             return resources.readerData[h.iType].MakeReadOnlySpan(firstReader, numReaders);
         }
@@ -114,7 +114,7 @@ public ref ResourceReaderData ResourceReader(ResourceHandle h, int i)
                 throw new Exception("Invalid reader id");
             }
 #endif
-            return ref resources.readerData[h.iType].ElementAt(ResourcesData.IndexReader(h, 0) + i);
+            return ref resources.readerData[h.iType].ElementAt(resources.IndexReader(h, 0) + i);
         }
 
         // Data per graph level renderpass

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.Debug.cs

@@ -351,7 +351,7 @@ internal void GenerateNativeCompilerDebugData(ref RenderGraph.DebugData debugDat
                             var numReaders = outputDataVersioned.numReaders;
                             for (var i = 0; i < numReaders; ++i)
                             {
-                                var depIdx = ResourcesData.IndexReader(output.resource, i);
+                                var depIdx = ctx.resources.IndexReader(output.resource, i);
                                 ref var dep = ref ctx.resources.readerData[output.resource.iType].ElementAt(depIdx);
 
                                 var outputDependencyPass = ctx.passData[dep.passId];

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs

@@ -594,7 +594,7 @@ void FindResourceUsageRanges()
                         var numReaders = pointToVer.numReaders;
                         for (var i = 0; i < numReaders; ++i)
                         {
-                            var depIdx = ResourcesData.IndexReader(outputResource, i);
+                            var depIdx = ctx.resources.IndexReader(outputResource, i);
                             ref var dep = ref ctx.resources.readerData[outputResource.iType].ElementAt(depIdx);
                             ref var depPass = ref ctx.passData.ElementAt(dep.passId);
                             if (pass.asyncCompute != depPass.asyncCompute)

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/ResourcesData.cs

@@ -146,14 +146,14 @@ public void SetWritingPass(CompilerContextData ctx, ResourceHandle h, int passId
         public void RegisterReadingPass(CompilerContextData ctx, ResourceHandle h, int passId, int index)
         {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
-            if (numReaders >= ResourcesData.MaxReaders)
+            if (numReaders >= ctx.resources.MaxReaders)
             {
                 string passName = ctx.GetPassName(passId);
                 string resourceName = ctx.GetResourceName(h);
-                throw new Exception($"Maximum '{ResourcesData.MaxReaders}' passes can use a single graph output as input. Pass {passName} is trying to read {resourceName}.");
+                throw new Exception($"Maximum '{ctx.resources.MaxReaders}' passes can use a single graph output as input. Pass {passName} is trying to read {resourceName}.");
             }
 #endif
-            ctx.resources.readerData[h.iType][ResourcesData.IndexReader(h, numReaders)] = new ResourceReaderData
+            ctx.resources.readerData[h.iType][ctx.resources.IndexReader(h, numReaders)] = new ResourceReaderData
             {
                 passId = passId,
                 inputSlot = index
@@ -167,13 +167,13 @@ public void RemoveReadingPass(CompilerContextData ctx, ResourceHandle h, int pas
         {
             for (int r = 0; r < numReaders;)
             {
-                ref var reader = ref ctx.resources.readerData[h.iType].ElementAt(ResourcesData.IndexReader(h, r));
+                ref var reader = ref ctx.resources.readerData[h.iType].ElementAt(ctx.resources.IndexReader(h, r));
                 if (reader.passId == passId)
                 {
                     // It should be removed, switch with the end of the list if we're not already at the end of it
                     if (r < numReaders - 1)
                     {
-                        reader = ctx.resources.readerData[h.iType][ResourcesData.IndexReader(h, numReaders - 1)];
+                        reader = ctx.resources.readerData[h.iType][ctx.resources.IndexReader(h, numReaders - 1)];
                     }
 
                     numReaders--;
@@ -193,8 +193,9 @@ internal class ResourcesData
         public NativeList<ResourceUnversionedData>[] unversionedData; // Flattened fixed size array storing info per resource id shared between all versions.
         public NativeList<ResourceVersionedData>[] versionedData; // Flattened fixed size array storing up to MaxVersions versions per resource id.
         public NativeList<ResourceReaderData>[] readerData; // Flattened fixed size array storing up to MaxReaders per resource id per version.
-        public const int MaxVersions = 20; // A quite arbitrary limit should be enough for most graphs. Increasing it shouldn't be a problem but will use more memory as these lists use a fixed size upfront allocation.
-        public const int MaxReaders = 100; // A quite arbitrary limit should be enough for most graphs. Increasing it shouldn't be a problem but will use more memory as these lists use a fixed size upfront allocation.
+
+        public int MaxVersions;
+        public int MaxReaders;
 
         public DynamicArray<Name>[] resourceNames;
 
@@ -229,6 +230,9 @@ public void Clear()
 
         public void Initialize(RenderGraphResourceRegistry resources)
         {
+            uint maxReaders = 0;
+            uint maxWriters = 0;
+
             for (int t = 0; t < (int)RenderGraphResourceType.Count; t++)
             {
                 RenderGraphResourceType resourceType = (RenderGraphResourceType) t;
@@ -287,8 +291,15 @@ public void Initialize(RenderGraphResourceRegistry resources)
                         default:
                             throw new Exception("Unsupported resource type: " + t);
                     }
+
+                    maxReaders = Math.Max(maxReaders, rll.readCount);
+                    maxWriters = Math.Max(maxWriters, rll.writeCount);
                 }
 
+                // The first resource is a null resource, so we need to add 1 to the count.
+                MaxReaders = (int)maxReaders + 1;
+                MaxVersions = (int)maxWriters + 1;
+
                 // Clear the other caching structures, they will be filled later
                 versionedData[t].Resize(MaxVersions * numResources, NativeArrayOptions.ClearMemory);
                 readerData[t].Resize(MaxVersions * MaxReaders * numResources, NativeArrayOptions.ClearMemory);
@@ -297,7 +308,7 @@ public void Initialize(RenderGraphResourceRegistry resources)
 
         // Flatten array index
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Index(ResourceHandle h)
+        public int Index(ResourceHandle h)
         {
 #if UNITY_EDITOR // Hot path
             if (h.version < 0 || h.version >= MaxVersions)
@@ -308,7 +319,7 @@ public static int Index(ResourceHandle h)
 
         // Flatten array index
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int IndexReader(ResourceHandle h, int readerID)
+        public int IndexReader(ResourceHandle h, int readerID)
         {
 #if UNITY_EDITOR // Hot path
             if (h.version < 0 || h.version >= MaxVersions)

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphBuilders.cs

@@ -219,6 +219,7 @@ private ResourceHandle UseResource(in ResourceHandle handle, AccessFlags flags,
                 }
 
                 m_RenderPass.AddResourceRead(versioned);
+                m_Resources.IncrementReadCount(handle);
 
                 if ((flags & AccessFlags.Read) == 0)
                 {
@@ -232,6 +233,7 @@ private ResourceHandle UseResource(in ResourceHandle handle, AccessFlags flags,
                 if ((flags & AccessFlags.Read) != 0)
                 {
                     m_RenderPass.AddResourceRead(m_Resources.GetZeroVersionedHandle(handle));
+                    m_Resources.IncrementReadCount(handle);
                 }
             }