[Backport] Fixed a null ref exception when baking APV without GPU str…

…eaming enabled Backport of https://github.cds.internal.unity3d.com/unity/unity/pull/41516
Unity-Technologies · Dec 21, 2023 · a061507 · a061507
1 parent f989cc6
commit a061507
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs
@@ -1184,12 +1184,6 @@ static public void ApplyPostBakeOperations(NativeArray<SphericalHarmonicsL2> sh,
 
             m_BakingBatchIndex = 0;
 
-            // Force maximum sh bands to perform baking, we need to store what sh bands was selected from the settings as we need to restore it after.
-            var prevSHBands = ProbeReferenceVolume.instance.shBands;
-            ProbeReferenceVolume.instance.ForceSHBand(ProbeVolumeSHBands.SphericalHarmonicsL2);
-            // Don't use Disk streaming to avoid having to wait for it when doing dilation.
-            ProbeReferenceVolume.instance.ForceNoDiskStreaming(true);
-
             PrepareCellsForWriting(isBakingSceneSubset);
 
             using var writeScope = new BakingCompleteProfiling(BakingCompleteProfiling.Stages.WriteBakedData);
@@ -1210,6 +1204,16 @@ static public void ApplyPostBakeOperations(NativeArray<SphericalHarmonicsL2> sh,
             // Reset internal structures depending on current bake.
             probeRefVolume.EnsureCurrentBakingSet(m_BakingSet);
 
+            // This subsequent block needs to happen AFTER we call WriteBakingCells.
+            // Otherwise in cases where we change the spacing between probes, we end up loading cells with a certain layout in ForceSHBand
+            // And then we unload cells using the wrong layout in PerformDilation (after WriteBakingCells updates the baking set object) which leads to a broken internal state.
+
+            // Don't use Disk streaming to avoid having to wait for it when doing dilation.
+            ProbeReferenceVolume.instance.ForceNoDiskStreaming(true);
+            // Force maximum sh bands to perform baking, we need to store what sh bands was selected from the settings as we need to restore it after.
+            var prevSHBands = ProbeReferenceVolume.instance.shBands;
+            ProbeReferenceVolume.instance.ForceSHBand(ProbeVolumeSHBands.SphericalHarmonicsL2);
+
             // TODO Discuss: Not nice to do this here, shouldn't reloading the asset also resolve cell data?
             // Would still need to reload common shared data like bricks as they are separately handled by the baking set itself.
             // Load common shared data (bricks + debug)

diff --git a/...nity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Streaming.cs b/...nity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolume.Streaming.cs
@@ -888,6 +888,10 @@ static int DefragComparer(Cell a, Cell b)
 
         void StartIndexDefragmentation()
         {
+            // We can end up here during baking (dilation) when trying to load all cells even without supporting GPU streaming.
+            if (!m_SupportGPUStreaming)
+                return;
+
             m_IndexDefragmentationInProgress = true;
 
             // Prepare the list of cells.