[APV] Bunch of bugfixes

Improve warnings with incorrect setups:
- detect when the active scene is not part of any baking set
- detect when loaded scenes are part of different baking sets

Fix sampling debug mode on URP with render graph due to invalid RG pass setup

Fix baking buttons on adjustment volume and probe volumes that could be clicked when baking is in progress
![image](https://media.github.cds.internal.unity3d.com/user/2154/files/f464c4db-6379-4d2c-bc93-b4d105fcdf81)

Fix brick placement when using probe offset and max possible probe spacing (reported on arctic demo)

Fix cloning of baking sets when opening a new scene in 'Single Scene' mode

Fix holes when voxelizing terrains
| before | after |
| -- | -- |
| ![image](https://media.github.cds.internal.unity3d.com/user/2154/files/e970157b-24f3-4f9a-b7be-1db589eead08) | ![image](https://media.github.cds.internal.unity3d.com/user/2154/files/4da5d861-2f64-4348-bac2-0c501e945236) |

Author: adrien-de-tocqueville

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

@@ -274,10 +274,11 @@ static void DrawBakingHelpers(SerializedProbeAdjustmentVolume p, Editor owner)
                 if (owner.targets.Length == 1)
                 {
                     EditorGUILayout.Space();
-                    using (new EditorGUI.DisabledScope(bakingSet == null))
+                    using (new EditorGUI.DisabledScope(Lightmapping.isRunning || bakingSet == null))
                     {
-                        if (GUILayout.Button(Styles.s_PreviewLighting))
-                            AdaptiveProbeVolumes.BakeAdjustmentVolume(bakingSet, ptv);
+                        using (new EditorGUI.DisabledScope(AdaptiveProbeVolumes.isRunning))
+                            if (GUILayout.Button(Styles.s_PreviewLighting))
+                                AdaptiveProbeVolumes.BakeAdjustmentVolume(bakingSet, ptv);
 
                         ProbeVolumeLightingTab.BakeAPVButton();
                     }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Dilate.cs

@@ -172,6 +172,18 @@ public void Dispose()
         static readonly int _NeedDilating = Shader.PropertyToID("_NeedDilating");
         static readonly int _DilationParameters = Shader.PropertyToID("_DilationParameters");
         static readonly int _OutputProbes = Shader.PropertyToID("_OutputProbes");
+        
+        // We need to keep the original list of cells that were actually baked to feed it to the dilation process.
+        // This is because during partial bake we only want to dilate those cells.
+        static Dictionary<int, BakingCell> m_CellsToDilate = new Dictionary<int, BakingCell>();
+        static Dictionary<Vector3Int, int> m_CellPosToIndex = new Dictionary<Vector3Int, int>();
+
+        // Free up dilation related data
+        static internal void FinalizeDilation()
+        {
+            m_CellPosToIndex.Clear();
+            m_CellsToDilate.Clear();
+        }
 
         // Can definitively be optimized later on.
         // Also note that all the bookkeeping of all the reference volumes will likely need to change when we move to

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.LightTransport.cs

@@ -118,7 +118,11 @@ public override bool Step()
                 }
 
                 // Fixup lighting for probes part of bricks with different subdivision levels
-                FixSeams(s_BakeData.positionRemap, positions, irradiance, validity);
+                // When baking reflection probes, we want to skip this step
+                if (m_BakingBatch != null)
+                {
+                    FixSeams(s_BakeData.positionRemap, positions, irradiance, validity);
+                }
 
                 return true;
             }

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

@@ -649,11 +649,7 @@ public void Dispose()
         static APVRTContext s_TracingContext;
         static BakeData s_BakeData;
 
-        static Dictionary<Vector3Int, int> m_CellPosToIndex = new Dictionary<Vector3Int, int>();
         static Dictionary<int, BakingCell> m_BakedCells = new Dictionary<int, BakingCell>();
-        // We need to keep the original list of cells that were actually baked to feed it to the dilation process.
-        // This is because during partial bake we only want to dilate those cells.
-        static Dictionary<int, BakingCell> m_CellsToDilate = new Dictionary<int, BakingCell>();
 
         internal static HashSet<string> partialBakeSceneList = null;
         internal static bool isBakingSceneSubset => partialBakeSceneList != null;
@@ -779,11 +775,18 @@ static bool SetBakingContext(List<ProbeVolumePerSceneData> perSceneData)
             return true;
         }
 
-        static void EnsurePerSceneDataInOpenScenes()
+        static bool EnsurePerSceneDataInOpenScenes()
         {
             var prv = ProbeReferenceVolume.instance;
             var activeScene = SceneManager.GetActiveScene();
 
+            prv.TryGetBakingSetForLoadedScene(activeScene, out var activeSet);
+            if (activeSet == null && ProbeVolumeBakingSet.SceneHasProbeVolumes(ProbeReferenceVolume.GetSceneGUID(activeScene)))
+            {
+                Debug.LogError($"Active scene at {activeScene.path} is not part of any baking set.");
+                return false;
+            }
+
             // We assume that all the per scene data for all the scenes in the set have been set with the scene been saved at least once. However we also update the scenes that are currently loaded anyway for security.
             // and to have a new trigger to update the bounds we have.
             int openedScenesCount = SceneManager.sceneCount;
@@ -794,12 +797,12 @@ static void EnsurePerSceneDataInOpenScenes()
                     continue;
 
                 ProbeVolumeBakingSet.OnSceneSaving(scene); // We need to perform the same actions we do when the scene is saved.
-                prv.TryGetBakingSetForLoadedScene(activeScene, out var activeSet); // Must be done after OnSceneSaved because it can put the set in the default baking set if needed.
                 prv.TryGetBakingSetForLoadedScene(scene, out var sceneBakingSet);
 
                 if (sceneBakingSet != null && sceneBakingSet != activeSet && ProbeVolumeBakingSet.SceneHasProbeVolumes(ProbeReferenceVolume.GetSceneGUID(scene)))
                 {
                     Debug.LogError($"Scene at {scene.path} is loaded and has probe volumes, but not part of the same baking set as the active scene. This will result in an error. Please make sure all loaded scenes are part of the same baking sets.");
+                    return false;
                 }
             }
 
@@ -811,6 +814,8 @@ static void EnsurePerSceneDataInOpenScenes()
                 if (!ProbeVolumeBakingSet.SceneHasProbeVolumes(perSceneData.sceneGUID))
                     CoreUtils.Destroy(perSceneData.gameObject);
             }
+
+            return true;
         }
 
         static void CachePVHashes(List<ProbeVolume> probeVolumes)
@@ -878,8 +883,8 @@ enum BakingStep
             VirtualOffset,
             LaunchThread,
             SkyOcclusion,
-            Integration,
             RenderingLayerMask,
+            Integration,
             FinalizeCells,
 
             Last = FinalizeCells + 1
@@ -940,7 +945,10 @@ static bool InitializeBake()
             if (!isFreezingPlacement)
             {
                 using (new BakingSetupProfiling(BakingSetupProfiling.Stages.EnsurePerSceneDataInOpenScenes))
-                    EnsurePerSceneDataInOpenScenes();
+                {
+                    if (!EnsurePerSceneDataInOpenScenes())
+                        return false;
+                }
             }
 
             if (ProbeReferenceVolume.instance.perSceneDataList.Count == 0) return false;
@@ -1391,6 +1399,9 @@ static void ApplyPostBakeOperations()
                 probeVolume.OnBakeCompleted();
             foreach (var adjustment in s_AdjustmentVolumes)
                 adjustment.volume.cachedHashCode = adjustment.volume.GetHashCode();
+
+            // We allocate data even if dilation is off, that should be changed
+            FinalizeDilation();
         }
 
 
@@ -1435,7 +1446,7 @@ public static bool BakeAsync()
         }
 
         /// <summary>
-        /// Returns true when the bake job is running, false otherwise (Read Only).
+        /// Returns true when the async baking of adaptive probe volumes only is running, false otherwise (Read Only).
         /// </summary>
         public static bool isRunning => s_AsyncBakeTaskID != -1;
 

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

@@ -247,7 +247,7 @@ public static Brick[] SubdivideCell(Vector3Int cellPosition, Bounds cellBounds,
                             {
                                 float brickSize = ProbeReferenceVolume.instance.BrickSize(brick.subdivisionLevel);
                                 Bounds brickBounds = new Bounds();
-                                brickBounds.min = (Vector3)brick.position * ProbeReferenceVolume.instance.MinBrickSize();
+                                brickBounds.min = subdivisionCtx.profile.probeOffset + (Vector3)brick.position * ProbeReferenceVolume.instance.MinBrickSize();
                                 brickBounds.max = brickBounds.min + new Vector3(brickSize, brickSize, brickSize);
 
                                 // If any volume that overlaps this brick wants this subdiv level, we keep it

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeUI.Drawer.cs

@@ -157,7 +157,7 @@ static void Drawer_VolumeContent(SerializedProbeVolume serialized, Editor owner)
             }
 
             EditorGUILayout.Space();
-            using (new EditorGUI.DisabledScope(bakingSet == null))
+            using (new EditorGUI.DisabledScope(Lightmapping.isRunning || bakingSet == null))
             {
                 ProbeVolumeLightingTab.BakeAPVButton();
             }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/VoxelizeScene.hlsl

@@ -152,12 +152,12 @@ TerrainVertexToFragment TerrainVert(uint vertexID : SV_VERTEXID, uint instanceID
     float4 vertex = GetQuadVertexPosition(vertexID % 4);
     uint2 heightmapLoadPosition = quadPos + vertex.xy;
 
+    float scale = _TerrainSize.xz / _TerrainHeightmapResolution;
+    vertex.xy = heightmapLoadPosition * scale;
+
     // flip quad to xz axis (default terrain orientation without rotation)
     vertex = float4(vertex.x, 0, vertex.y, 1);
 
-    // Offset quad to create the plane terrain
-    vertex.xz += (float2(quadPos) / float(_TerrainHeightmapResolution)) * _TerrainSize.xz;
-
     uint2 id = (quadPos / _TerrainSize.xz) * _TerrainHeightmapResolution;
     float height = UnpackHeightmap(_TerrainHeightmapTexture.Load(uint3(heightmapLoadPosition, 0)));
     vertex.y += height * _TerrainSize.y * 2;

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

@@ -171,9 +171,27 @@ public bool RemoveScenario(string name)
 
         internal ProbeVolumeBakingSet Clone()
         {
-            var newSet = Instantiate(this);
-            newSet.m_SceneGUIDs.Clear();
-            newSet.m_SceneBakeData.Clear();
+            var newSet = CreateInstance<ProbeVolumeBakingSet>();
+
+            // We don't want to clone everything in the set
+            // Especially don't copy reference to baked data !
+            newSet.probeOffset = probeOffset;
+            newSet.simplificationLevels = simplificationLevels;
+            newSet.minDistanceBetweenProbes = minDistanceBetweenProbes;
+            newSet.renderersLayerMask = renderersLayerMask;
+            newSet.minRendererVolumeSize = minRendererVolumeSize;
+            newSet.skyOcclusion = skyOcclusion;
+            newSet.skyOcclusionBakingSamples = skyOcclusionBakingSamples;
+            newSet.skyOcclusionBakingBounces = skyOcclusionBakingBounces;
+            newSet.skyOcclusionAverageAlbedo = skyOcclusionAverageAlbedo;
+            newSet.skyOcclusionBackFaceCulling = skyOcclusionBackFaceCulling;
+            newSet.skyOcclusionShadingDirection = skyOcclusionShadingDirection;
+            newSet.useRenderingLayers = useRenderingLayers;
+            newSet.renderingLayerMasks = renderingLayerMasks != null ? (ProbeLayerMask[])renderingLayerMasks.Clone() : null;
+            newSet.useRenderingLayers = useRenderingLayers;
+            newSet.useRenderingLayers = useRenderingLayers;
+            newSet.useRenderingLayers = useRenderingLayers;
+            newSet.useRenderingLayers = useRenderingLayers;
             return newSet;
         }
 

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

@@ -89,7 +89,7 @@ static Vector3[] GenerateSkyDirections()
         #endregion
 
         #region AntiLeak Buffer generator
-#if UNITY_EDITOR
+        #if UNITY_EDITOR
         static uint3 GetSampleOffset(uint i)
         {
             return new uint3(i, i >> 1, i >> 2) & 1;
@@ -252,7 +252,7 @@ static uint ComputeAntiLeakData(uint validityMask)
             return mask;
         }
 
-        [UnityEditor.MenuItem("Edit/Rendering/Global Illumination/Generate AntiLeak Buffer")]
+        //[UnityEditor.MenuItem("Edit/Rendering/Global Illumination/Generate AntiLeak Buffer")]
         static uint[] BuildAntiLeakDataArray()
         {
             uint[] antileak = new uint[256];

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Debug.cs

@@ -1446,7 +1446,7 @@ void WriteApvPositionNormalDebugBuffer(RenderGraph renderGraph, GraphicsBuffer r
         {
             using (var builder = renderGraph.AddRenderPass<WriteApvData>("APV Debug Sampling", out var passData, ProfilingSampler.Get(HDProfileId.APVSamplingDebug)))
             {
-                passData.resultBuffer = renderGraph.ImportBuffer(resultBuffer);
+                passData.resultBuffer = builder.WriteBuffer(renderGraph.ImportBuffer(resultBuffer));
                 passData.clickCoordinates = clickCoordinates;
                 passData.depthBuffer = builder.ReadTexture(depthBuffer);
                 passData.normalBuffer = builder.ReadTexture(normalBuffer);