[APV] Fixes and documentation

- Add missing APIs requested by users:
  - get baking set for scene
  - load baking set for scene
  - trigger APV bake from script
- Fix warning when baking dilation on URP
- Fix missing wait on opencl buffer upload
- Added Validity Based leak reduction mode to fix sampling artefacts
- Fixed blending section in rendering debugger

Update Documentation
- Renamed 'Probe Volume' -> 'Adaptive Probe Volumes'
- Added page for documenting the various APIs

Author: adrien-de-tocqueville

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

@@ -318,8 +318,8 @@ static void PerformDilation(ProbeReferenceVolume.Cell cell, ProbeVolumeBakingSet
                 cmd.SetGlobalTexture(ProbeReferenceVolume.ShaderIDs._APVResL2_2, rr.L2_2);
                 cmd.SetGlobalTexture(ProbeReferenceVolume.ShaderIDs._APVResL2_3, rr.L2_3);
 
-                cmd.SetComputeTextureParam(dilationShader, dilationKernel, ProbeReferenceVolume.ShaderIDs._SkyOcclusionTexL0L1, rr.SkyOcclusionL0L1 ?? (RenderTargetIdentifier)TextureXR.GetBlackTexture3D());
-                cmd.SetComputeTextureParam(dilationShader, dilationKernel, ProbeReferenceVolume.ShaderIDs._SkyShadingDirectionIndicesTex, rr.SkyShadingDirectionIndices ?? (RenderTargetIdentifier)TextureXR.GetBlackTexture3D());
+                cmd.SetComputeTextureParam(dilationShader, dilationKernel, ProbeReferenceVolume.ShaderIDs._SkyOcclusionTexL0L1, rr.SkyOcclusionL0L1 ?? (RenderTargetIdentifier)CoreUtils.blackVolumeTexture);
+                cmd.SetComputeTextureParam(dilationShader, dilationKernel, ProbeReferenceVolume.ShaderIDs._SkyShadingDirectionIndicesTex, rr.SkyShadingDirectionIndices ?? (RenderTargetIdentifier)CoreUtils.blackVolumeTexture);
                 cmd.SetComputeBufferParam(dilationShader, dilationKernel, ProbeReferenceVolume.ShaderIDs._SkyPrecomputedDirections, rr.SkyPrecomputedDirections);
             }
 

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

@@ -4,7 +4,7 @@
 
 #ifndef PROBEGIBAKING_DILATE_CS_HLSL
 #define PROBEGIBAKING_DILATE_CS_HLSL
-// Generated from UnityEngine.Rendering.ProbeGIBaking+DilatedProbe
+// Generated from UnityEngine.Rendering.AdaptiveProbeVolumes+DilatedProbe
 // PackingRules = Exact
 struct DilatedProbe
 {

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

@@ -286,7 +286,8 @@ public static BakeContext New(InputExtraction.BakeInput input, NativeArray<Vecto
 
                 // Upload probe positions
                 var positionsSlice = new BufferSlice<Vector3>(ctx.positionsBufferID, 0);
-                ctx.ctx.WriteBuffer(positionsSlice, probePositions);
+                var writeEvent = ctx.ctx.WriteBuffer(positionsSlice, probePositions);
+                ctx.ctx.Wait(writeEvent);
 
                 return ctx;
             }

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

@@ -120,7 +120,7 @@ static internal bool CanFreezePlacement()
 
             foreach (var sceneData in sceneDataList)
             {
-                if (sceneData.bakingSet == null || sceneData.bakingSet.GetSceneCellIndexList(sceneData.sceneGUID) == null)
+                if (sceneData.serializedBakingSet == null || sceneData.serializedBakingSet.GetSceneCellIndexList(sceneData.sceneGUID) == null)
                     return false;
             }
 

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

@@ -134,9 +134,9 @@ static void GenerateScenesCellLists(List<ProbeVolumePerSceneData> bakedSceneData
                 Debug.Assert(ProbeVolumeBakingSet.SceneHasProbeVolumes(data.sceneGUID));
                 bakedSceneGUIDList.Add(data.sceneGUID);
 
-                if (m_BakingSet != data.bakingSet)
+                if (m_BakingSet != data.serializedBakingSet)
                 {
-                    data.bakingSet = m_BakingSet;
+                    data.serializedBakingSet = m_BakingSet;
                     EditorUtility.SetDirty(data);
                 }
             }
@@ -194,7 +194,7 @@ static void PrepareCellsForWriting(bool isBakingSubset)
             // Remap if needed existing Cell descriptors in the baking set.
             var cellRemapTable = RemapBakedCells(isBakingSubset);
 
-            // Generate list of cells for all cells being baked and remap untouched existing scenes if needed.
+            // Generate list of cells for all scenes being baked and remap untouched existing scenes if needed.
             GenerateScenesCellLists(GetPerSceneDataList(), cellRemapTable);
 
             if (isBakingSubset)
@@ -207,8 +207,8 @@ static void PrepareCellsForWriting(bool isBakingSubset)
                     // If a scene was baked
                     if (m_BakingSet.perSceneCellLists.TryGetValue(sceneGUID, out var cellList))
                     {
-                        // And the scene is not loaded
-                        if (!loadedSceneDataList.Exists((x) => x.sceneGUID == sceneGUID) && cellList.Count != 0)
+                        // And the scene is not in the baked subset
+                        if (cellList.Count != 0 && !partialBakeSceneList.Contains(sceneGUID))
                         {
                             // Resolve its data in CPU memory.
                             bool resolved = m_BakingSet.ResolveCellData(cellList);

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

@@ -362,7 +362,7 @@ static internal void RecomputeVOForDebugOnly()
 
             foreach (var sceneData in prv.perSceneDataList)
             {
-                prv.AddPendingSceneLoading(sceneData.sceneGUID, sceneData.bakingSet);
+                prv.AddPendingSceneLoading(sceneData.sceneGUID, sceneData.serializedBakingSet);
             }
 
             prv.PerformPendingOperations();

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

@@ -785,7 +785,7 @@ static void CellCountInDirections(out Vector3Int minCellPositionXYZ, out Vector3
         {
             minCellPositionXYZ = Vector3Int.zero;
             maxCellPositionXYZ = Vector3Int.zero;
-            
+
             var centeredMin = globalBounds.min - worldOffset;
             var centeredMax = globalBounds.max - worldOffset;
 
@@ -928,7 +928,7 @@ static bool InitializeBake()
             foreach (var data in ProbeReferenceVolume.instance.perSceneDataList)
             {
                 // It can be null if the scene was never added to a baking set and we are baking in single scene mode, in that case we don't have a baking set for it yet and we need to skip
-                if (data.bakingSet != null)
+                if (data.serializedBakingSet != null)
                     data.Initialize();
             }
 
@@ -1179,7 +1179,7 @@ internal static void AsyncBakeCallback()
         /// Starts an asynchronous bake job for Adaptive Probe Volumes.
         /// </summary>
         /// <returns>Returns true if the bake was successfully started.</returns>
-        internal static bool BakeAsync()
+        public static bool BakeAsync()
         {
             if (Lightmapping.isRunning || AdaptiveProbeVolumes.isRunning || !PrepareBaking())
                 return false;
@@ -1200,13 +1200,13 @@ internal static bool BakeAsync()
         /// <summary>
         /// Returns true when the bake job is running, false otherwise (Read Only).
         /// </summary>
-        internal static bool isRunning => s_AsyncBakeTaskID != -1;
+        public static bool isRunning => s_AsyncBakeTaskID != -1;
 
         /// <summary>
         /// Cancels the currently running asynchronous bake job.
         /// </summary>
-        /// <returns></returns>
-        internal static bool Cancel() => Progress.Cancel(s_AsyncBakeTaskID);
+        /// <returns>Returns true if baking was successfully cancelled.</returns>
+        public static bool Cancel() => Progress.Cancel(s_AsyncBakeTaskID);
 
         /// <summary>
         /// Request additional bake request manager to recompute baked data for an array of requests
@@ -1252,7 +1252,7 @@ public static void BakeAdditionalRequest(int probeInstanceID)
 
             BakeAdditionalRequests(probeInstanceIDs);
         }
-        
+
         static VirtualOffsetBaker virtualOffsetOverride = null;
         static LightingBaker lightingOverride = null;
         static SkyOcclusionBaker skyOcclusionOverride = null;
@@ -1263,26 +1263,26 @@ public static void SetVirtualOffsetBakerOverride(VirtualOffsetBaker baker)
         {
             virtualOffsetOverride = baker;
         }
-        /// <summary>Used to override the sky occlusion baking system.</summary>
+        /// <summary>Used to override the lighting baking system.</summary>
         /// <param name="baker">The baker override or null to use the default system.</param>
         public static void SetLightingBakerOverride(LightingBaker baker)
         {
             lightingOverride = baker;
         }
-        /// <summary>Used to override the probe volume light baking system.</summary>
+        /// <summary>Used to override the sky occlusion baking system.</summary>
         /// <param name="baker">The baker override or null to use the default system.</param>
         public static void SetSkyOcclusionBakerOverride(SkyOcclusionBaker baker)
         {
             skyOcclusionOverride = baker;
         }
-        
+
         /// <summary>Used to override the virtual offset baking system.</summary>
         /// <returns>The baker override or null if none is set.</returns>
         public static VirtualOffsetBaker GetVirtualOffsetBakerOverride()
         {
             return virtualOffsetOverride;
         }
-        /// <summary>Used to override the virtual offset baking system.</summary>
+        /// <summary>Used to override the lighting baking system.</summary>
         /// <returns>The baker override or null if none is set.</returns>
         public static LightingBaker GetLightingBakerOverride()
         {

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

@@ -539,7 +539,7 @@ ProbeVolumeBakingSet CreateBakingSet()
 
         void CreateProbeVolume()
         {
-            var probeVolume = CoreEditorUtils.CreateGameObject(null, "Probe Volume");
+            var probeVolume = CoreEditorUtils.CreateGameObject(null, "Adaptive Probe Volume");
             var pv = probeVolume.AddComponent<ProbeVolume>();
             pv.mode = ProbeVolume.Mode.Scene;
             EditorSceneManager.MarkSceneDirty(SceneManager.GetActiveScene());
@@ -957,8 +957,8 @@ internal bool PrepareAPVBake()
             {
                 if(!activeSet.DialogNoProbeVolumeInSetShown())
                 {
-                    if(EditorUtility.DisplayDialog("No Probe Volume in Scene", "Adaptive Probe Volumes are enabled for this Project, but none exist in the Scene.\n\n" +
-                        "Do you wish to add a Probe Volume to the Active Scene?", "Yes", "No"))
+                    if(EditorUtility.DisplayDialog("No Adaptive Probe Volume in Scene", "Adaptive Probe Volumes are enabled for this Project, but none exist in the Scene.\n\n" +
+                        "Do you wish to add an Adaptive Probe Volume to the Active Scene?", "Yes", "No"))
                         CreateProbeVolume();
                     activeSet.SetDialogNoProbeVolumeInSetShown(true);
                 }

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

@@ -44,7 +44,10 @@ public override void OnInspectorGUI()
             PropertyField(m_SamplingNoise);
             PropertyField(m_AnimateNoise);
             PropertyField(m_LeakReductionMode);
-            if (m_LeakReductionMode.value.intValue != 0)
+            if (m_LeakReductionMode.value.intValue == (int)APVLeakReductionMode.ValidityBased)
+            {
+            }
+            else if (m_LeakReductionMode.value.intValue == (int)APVLeakReductionMode.ValidityAndNormalBased)
             {
                 using (new IndentLevelScope())
                     PropertyField(m_MinValidDotProdValue);

Packages/com.unity.render-pipelines.core/Runtime/Debug/ProbeVolumeDebugFunctions.hlsl

@@ -75,7 +75,7 @@
         {
             return float4(CalculateDiffuseLighting(i) * exp2(_ExposureCompensation) * GetCurrentExposureMultiplier(), 1);
         }
-        else if (_ShadingMode == DEBUGPROBESHADINGMODE_INVALIDATED_BY_TOUCHUP_VOLUMES)
+        else if (_ShadingMode == DEBUGPROBESHADINGMODE_INVALIDATED_BY_ADJUSTMENT_VOLUMES)
         {
             float4 defaultCol = float4(CalculateDiffuseLighting(i) * exp2(_ExposureCompensation) * GetCurrentExposureMultiplier(), 1);
             float touchupAction = UNITY_ACCESS_INSTANCED_PROP(Props, _TouchupedByVolume);