Internal/6000.0/staging

Packages/com.unity.render-pipelines.core/Documentation~/TableOfContents.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/Editor/Lighting/ProbeVolume/ProbeVolumeBuildProcessor.cs

@@ -4,11 +4,10 @@
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 using UnityEngine.Rendering;
-using UnityEngine.SceneManagement;
 
 namespace UnityEditor.Rendering
 {
-    class ProbeVolumeBuildProcessor : BuildPlayerProcessor, IProcessSceneWithReport
+    class ProbeVolumeBuildProcessor : BuildPlayerProcessor, IPostprocessBuildWithReport
     {
         const string kTempAPVStreamingAssetsPath = "TempAPVStreamingAssets";
 
@@ -18,15 +17,27 @@ string GetTempAPVStreamingAssetsPath()
             return Path.Combine(libraryPath, kTempAPVStreamingAssetsPath);
         }
 
-        void PrepareStreamableAsset(ProbeVolumeStreamableAsset asset, string basePath, bool useStreamingAsset)
+        // Include an asset in the build. The mechanism for doing so depends on whether we are using StreamingAssets path.
+        static void IncludeStreamableAsset(ProbeVolumeStreamableAsset asset, string basePath, bool useStreamingAsset)
         {
-            asset.UpdateAssetReference(useStreamingAsset);
-
             if (useStreamingAsset)
+            {
+                asset.ClearAssetReferenceForBuild();
                 CopyStreamableAsset(asset, basePath);
+            }
+            else
+            {
+                asset.EnsureAssetLoaded();
+            }
+        }
+
+        // Ensure that an asset is not included in the build.
+        static void StripStreambleAsset(ProbeVolumeStreamableAsset asset)
+        {
+            asset.ClearAssetReferenceForBuild();
         }
 
-        void CopyStreamableAsset(ProbeVolumeStreamableAsset asset, string basePath)
+        static void CopyStreamableAsset(ProbeVolumeStreamableAsset asset, string basePath)
         {
             var assetPath = asset.GetAssetPath();
             if (!File.Exists(assetPath))
@@ -60,6 +71,9 @@ void GetProbeVolumeProjectSettings(BuildTarget target, out bool supportProbeVolu
             }
         }
 
+        // Keep track of which assets we touched during the build, so we can restore them after the build.
+        private static HashSet<ProbeVolumeBakingSet> s_BakingSetsProcessedLastBuild = new();
+
         public override void PrepareForBuild(BuildPlayerContext buildPlayerContext)
         {
             GetProbeVolumeProjectSettings(buildPlayerContext.BuildPlayerOptions.target, out bool supportProbeVolume, out var maxSHBands);
@@ -89,16 +103,15 @@ public override void PrepareForBuild(BuildPlayerContext buildPlayerContext)
 
             Directory.CreateDirectory(tempStreamingAssetsPath);
 
-            HashSet<ProbeVolumeBakingSet> processedBakingSets = new HashSet<ProbeVolumeBakingSet>();
-
+            s_BakingSetsProcessedLastBuild.Clear();
             foreach (var scene in buildPlayerContext.BuildPlayerOptions.scenes)
             {
                 var sceneGUID = AssetDatabase.AssetPathToGUID(scene);
                 var bakingSet = ProbeVolumeBakingSet.GetBakingSetForScene(sceneGUID);
                 if (bakingSet != null)
                 {
                     // Already processed (different scenes can belong to the same baking set).
-                    if (processedBakingSets.Contains(bakingSet))
+                    if (s_BakingSetsProcessedLastBuild.Contains(bakingSet))
                         continue;
 
                     if (!bakingSet.cellSharedDataAsset.IsValid()) // Not baked
@@ -111,89 +124,53 @@ public override void PrepareForBuild(BuildPlayerContext buildPlayerContext)
 
                     bool useStreamingAsset = !GraphicsSettings.GetRenderPipelineSettings<ProbeVolumeGlobalSettings>().probeVolumeDisableStreamingAssets;
 
-                    PrepareStreamableAsset(bakingSet.cellSharedDataAsset, basePath, useStreamingAsset);
-                    PrepareStreamableAsset(bakingSet.cellBricksDataAsset, basePath, useStreamingAsset);
+                    IncludeStreamableAsset(bakingSet.cellSharedDataAsset, basePath, useStreamingAsset);
+                    IncludeStreamableAsset(bakingSet.cellBricksDataAsset, basePath, useStreamingAsset);
                     // For now we always strip support data in build as it's mostly unsupported.
                     // Later we'll need a proper option to strip it or not.
                     bool stripSupportData = true;
-                    if (!stripSupportData)
-                        PrepareStreamableAsset(bakingSet.cellSupportDataAsset, basePath, useStreamingAsset);
+                    if (stripSupportData)
+                        StripStreambleAsset(bakingSet.cellSupportDataAsset);
+                    else
+                        IncludeStreamableAsset(bakingSet.cellSupportDataAsset, basePath, useStreamingAsset);
 
                     foreach (var scenario in bakingSet.scenarios)
                     {
-                        PrepareStreamableAsset(scenario.Value.cellDataAsset, basePath, useStreamingAsset);
+                        IncludeStreamableAsset(scenario.Value.cellDataAsset, basePath, useStreamingAsset);
                         if (maxSHBands == ProbeVolumeSHBands.SphericalHarmonicsL2)
-                            PrepareStreamableAsset(scenario.Value.cellOptionalDataAsset, basePath, useStreamingAsset);
-                        PrepareStreamableAsset(scenario.Value.cellProbeOcclusionDataAsset, basePath, useStreamingAsset);
+                            IncludeStreamableAsset(scenario.Value.cellOptionalDataAsset, basePath, useStreamingAsset);
+                        else
+                            StripStreambleAsset(scenario.Value.cellOptionalDataAsset);
+                        IncludeStreamableAsset(scenario.Value.cellProbeOcclusionDataAsset, basePath, useStreamingAsset);
                     }
 
-                    processedBakingSets.Add(bakingSet);
+                    s_BakingSetsProcessedLastBuild.Add(bakingSet);
                 }
             }
 
             buildPlayerContext.AddAdditionalPathToStreamingAssets(tempStreamingAssetsPath, AdaptiveProbeVolumes.kAPVStreamingAssetsPath);
         }
 
-        private static bool IsBundleBuild(BuildReport report, bool isPlaying)
-        {
-            // We are entering playmode, so not building a bundle.
-            if (isPlaying)
-                return false;
-
-            // Addressable builds do not provide a BuildReport. Because the Addressables package
-            // only supports AssetBundle builds, we infer that this is not a player build.
-            if (report == null)
-                return true;
-
-            return report.summary.buildType == BuildType.AssetBundle;
-        }
-
-        // This codepath handles the case of building asset bundles, i.e. not a full player build. It updates the references
-        // to individual data assets in the baking sets for each scene, such that the assets are included in the bundle.
-        public override int callbackOrder => 1;
-        public void OnProcessScene(Scene scene, BuildReport report)
+        public void OnPostprocessBuild(BuildReport report)
         {
-            // Only run for bundle builds.
-            if (!IsBundleBuild(report, Application.isPlaying))
-                return;
-
-            // Only run when APV is enabled.
-            GetProbeVolumeProjectSettings(EditorUserBuildSettings.activeBuildTarget, out bool supportProbeVolume, out var maxSHBands);
-            if (!supportProbeVolume)
-                return;
-
-            // Reload the map from scene to baking set if we couldn't find the specific baking set.
-            if (ProbeVolumeBakingSet.sceneToBakingSet == null || ProbeVolumeBakingSet.sceneToBakingSet.Count == 0)
-                ProbeVolumeBakingSet.SyncBakingSets();
-
-            // Get the baking set for the scene.
-            var bakingSet = ProbeVolumeBakingSet.GetBakingSetForScene(scene.GetGUID());
-            if (bakingSet == null || !bakingSet.cellSharedDataAsset.IsValid())
+            if (s_BakingSetsProcessedLastBuild == null || s_BakingSetsProcessedLastBuild.Count == 0)
                 return;
 
-            bool useStreamingAsset = !GraphicsSettings.GetRenderPipelineSettings<ProbeVolumeGlobalSettings>().probeVolumeDisableStreamingAssets;
-            if (useStreamingAsset)
+            // Go over each asset reference we touched during the last build, make sure asset references are intact.
+            foreach (var bakingSet in s_BakingSetsProcessedLastBuild)
             {
-                Debug.LogWarning(
-                    "Attempted to build an Asset Bundle containing Adaptive Probe Volume data, but streaming assets are enabled. This is unsupported. " +
-                    "To use Adaptive Probe Volumes with Asset Bundles, please check 'Probe Volume Disable Streaming Assets' under Graphics Settings.");
+                bakingSet.cellBricksDataAsset.EnsureAssetLoaded();
+                bakingSet.cellSharedDataAsset.EnsureAssetLoaded();
+                bakingSet.cellSupportDataAsset.EnsureAssetLoaded();
+                foreach (var scenario in bakingSet.scenarios)
+                {
+                    scenario.Value.cellDataAsset.EnsureAssetLoaded();
+                    scenario.Value.cellOptionalDataAsset.EnsureAssetLoaded();
+                    scenario.Value.cellProbeOcclusionDataAsset.EnsureAssetLoaded();
+                }
             }
 
-            // Update all the asset references.
-            bakingSet.cellSharedDataAsset.UpdateAssetReference(useStreamingAsset);
-            bakingSet.cellBricksDataAsset.UpdateAssetReference(useStreamingAsset);
-
-            bool stripSupportData = true;
-            if (!stripSupportData)
-                bakingSet.cellSupportDataAsset.UpdateAssetReference(false);
-
-            foreach (var scenario in bakingSet.scenarios)
-            {
-                scenario.Value.cellDataAsset.UpdateAssetReference(useStreamingAsset);
-                if (maxSHBands == ProbeVolumeSHBands.SphericalHarmonicsL2)
-                    scenario.Value.cellOptionalDataAsset.UpdateAssetReference(useStreamingAsset);
-                scenario.Value.cellProbeOcclusionDataAsset.UpdateAssetReference(useStreamingAsset);
-            }
+            s_BakingSetsProcessedLastBuild.Clear();
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/AssemblyInfo.cs

@@ -5,3 +5,7 @@
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Runtime.Tests")]
 [assembly: InternalsVisibleTo("Unity.GraphicTests.Performance.RPCore.Runtime")]
 [assembly: InternalsVisibleTo("Unity.GraphicTests.Performance.Universal.Runtime")] // access to internal ProfileIds
+
+// Smoke test project visibility
+[assembly: InternalsVisibleTo("SRPSmoke.Runtime.Tests")]
+[assembly: InternalsVisibleTo("SRPSmoke.Editor.Tests")]

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/GPUResidentDrawer.cs

@@ -334,7 +334,7 @@ private static void Recreate(GPUResidentDrawerSettings settings)
         private NativeList<int> m_FrameCameraIDs;
         private bool m_FrameUpdateNeeded = false;
 
-        private bool m_SelectionChanged;
+        private bool m_IsSelectionDirty;
 
         static GPUResidentDrawer()
         {
@@ -399,6 +399,7 @@ private GPUResidentDrawer(GPUResidentDrawerSettings settings, int maxInstanceCou
 #if UNITY_EDITOR
             AssemblyReloadEvents.beforeAssemblyReload += OnAssemblyReload;
             m_FrameCameraIDs = new NativeList<int>(1, Allocator.Persistent);
+            m_IsSelectionDirty = true; // Force at least one selection update
 #endif
             SceneManager.sceneLoaded += OnSceneLoaded;
 
@@ -429,6 +430,7 @@ private void Dispose()
 #endif
             SceneManager.sceneLoaded -= OnSceneLoaded;
 
+            // Note: Those RenderPipelineManager callbacks do not run when using built-in editor debug views such as lightmap, shadowmask etc
             RenderPipelineManager.beginContextRendering -= OnBeginContextRendering;
             RenderPipelineManager.endContextRendering -= OnEndContextRendering;
             RenderPipelineManager.beginCameraRendering -= OnBeginCameraRendering;
@@ -487,6 +489,7 @@ private void OnBeginContextRendering(ScriptableRenderContext context, List<Camer
         // If running in the editor the player loop might not run
         // In order to still have a single frame update we keep track of the camera ids
         // A frame update happens in case the first camera is rendered again
+        // Note: This doesn't run when using built-in debug views such as lightmaps, shadowmask and etc
         private void EditorFrameUpdate(List<Camera> cameras)
         {
             bool newFrame = false;
@@ -508,21 +511,16 @@ private void EditorFrameUpdate(List<Camera> cameras)
                 else
                     m_FrameUpdateNeeded = true;
             }
-
-            ProcessSelection();
         }
 
         private void OnSelectionChanged()
         {
-            m_SelectionChanged = true;
+            m_IsSelectionDirty = true;
         }
 
-        private void ProcessSelection()
+        private void UpdateSelection()
         {
-            if(!m_SelectionChanged)
-                return;
-
-            m_SelectionChanged = false;
+            Profiler.BeginSample("GPUResidentDrawer.UpdateSelection");
 
             Object[] renderers = Selection.GetFiltered(typeof(MeshRenderer), SelectionMode.Deep);
 
@@ -532,8 +530,10 @@ private void ProcessSelection()
                 rendererIDs[i] = renderers[i] ? renderers[i].GetInstanceID() : 0;
 
             m_Batcher.UpdateSelectedRenderers(rendererIDs);
-
+            
             rendererIDs.Dispose();
+
+            Profiler.EndSample();
         }
 #endif
 
@@ -612,10 +612,15 @@ private void PostPostLateUpdate()
             supportedChangedPackedMaterialDatas.Dispose();
 
             m_BatchersContext.UpdateInstanceMotions();
-
             m_Batcher.UpdateFrame();
 
 #if UNITY_EDITOR
+            if (m_IsSelectionDirty)
+            {
+                UpdateSelection();
+                m_IsSelectionDirty = false;
+            }
+
             m_FrameUpdateNeeded = false;
 #endif
         }

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

@@ -31,7 +31,8 @@ public sealed partial class ProbeVolumeBakingSet : ScriptableObject, ISerializat
         internal enum Version
         {
             Initial,
-            RemoveProbeVolumeSceneData
+            RemoveProbeVolumeSceneData,
+            AssetsAlwaysReferenced,
         }
 
         [Serializable]
@@ -345,6 +346,28 @@ internal void Migrate()
 #endif
                 }
 
+                // Upgrade baking sets from before we always stored asset references.
+                if (version < Version.AssetsAlwaysReferenced && ProbeReferenceVolume.instance.isInitialized)
+                {
+#if UNITY_EDITOR
+                    cellBricksDataAsset.EnsureAssetLoaded();
+                    cellSharedDataAsset.EnsureAssetLoaded();
+                    cellSupportDataAsset.EnsureAssetLoaded();
+                    foreach (var scenario in scenarios)
+                    {
+                        scenario.Value.cellDataAsset.EnsureAssetLoaded();
+                        scenario.Value.cellOptionalDataAsset.EnsureAssetLoaded();
+                        scenario.Value.cellProbeOcclusionDataAsset.EnsureAssetLoaded();
+                    }
+
+                    version = Version.AssetsAlwaysReferenced;
+
+                    // Save immediately since these references must be written to disk for certain functionality
+                    // to work, such as exporting a .unitypackage. Changing in memory is not enough.
+                    UnityEditor.EditorUtility.SetDirty(this);
+                    UnityEditor.AssetDatabase.SaveAssetIfDirty(this);
+#endif
+                }
 #pragma warning restore 618
             }
 

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

@@ -43,6 +43,9 @@ public ProbeVolumeStreamableAsset(string apvStreamingAssetsPath, SerializedDicti
             m_StreamableCellDescs = cellDescs;
             m_ElementSize = elementSize;
             m_StreamableAssetPath = Path.Combine(Path.Combine(apvStreamingAssetsPath, bakingSetGUID), m_AssetGUID + ".bytes");
+#if UNITY_EDITOR
+            EnsureAssetLoaded();
+#endif
         }
 
         internal void RefreshAssetPath()
@@ -89,9 +92,16 @@ public void RenameAsset(string newName)
             m_FinalAssetPath = "";
         }
 
-        public void UpdateAssetReference(bool useStreamingAsset)
+        // Ensures that the asset is referenced via Unity's serialization layer.
+        public void EnsureAssetLoaded()
+        {
+            m_Asset = AssetDatabase.LoadAssetAtPath<TextAsset>(GetAssetPath());
+        }
+
+        // Temporarily clear the asset reference. Used to prevent serialization of the asset when we are using the StreamingAssets codepath.
+        public void ClearAssetReferenceForBuild()
         {
-            m_Asset = useStreamingAsset ? null : AssetDatabase.LoadAssetAtPath<TextAsset>(GetAssetPath());
+            m_Asset = null;
         }
 #endif
 

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

@@ -4,6 +4,7 @@
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.Rendering;
 using System.Collections.Generic;
+using Unity.Collections;
 
 namespace UnityEngine.Rendering.RenderGraphModule.NativeRenderPassCompiler
 {
@@ -594,7 +595,9 @@ public readonly ReadOnlySpan<PassData> GraphPasses(CompilerContextData ctx)
                 return ctx.passData.MakeReadOnlySpan(firstGraphPass, numGraphPasses);
             }
 
-            var actualPasses = new PassData[numGraphPasses];
+            var actualPasses =
+                new NativeArray<PassData>(numGraphPasses, Allocator.Temp,
+                    NativeArrayOptions.UninitializedMemory);
 
             for (int i = firstGraphPass, index = 0; i < lastGraphPass + 1; ++i)
             {

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

@@ -2519,7 +2519,7 @@ void GenerateCompilerDebugData(ref DebugData debugData)
                 newPass.syncFromPassIndex = passInfo.syncFromPassIndex;
                 newPass.syncToPassIndex = passInfo.syncToPassIndex;
 
-                DebugData.s_PassScriptMetadata.TryGetValue(pass.name, out newPass.scriptInfo);
+                DebugData.s_PassScriptMetadata.TryGetValue(pass, out newPass.scriptInfo);
 
                 for (int type = 0; type < (int)RenderGraphResourceType.Count; ++type)
                 {

Packages/com.unity.render-pipelines.core/Tests/Editor/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("SRPSmoke.Editor.Tests")]