[Port] [6000.5] Added back support for preview adjustments with override sample count.

Author: svc-reach-platform-support

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

@@ -670,7 +670,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                     failed |= !layerMaskJob.Step();
 
                 // Bake probe SH
-                s_BakeData.InitLightingJob(m_BakingSet, uniquePositions, BakeType.ApvOnly);
+                s_BakeData.InitLightingJob(bakingSet, touchup, uniquePositions, BakeType.ApvOnly);
                 LightingBaker lightingJob = s_BakeData.lightingJob;
                 while (!failed && lightingJob.currentStep < lightingJob.stepCount)
                     failed |= !lightingJob.Step();
@@ -680,7 +680,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                 foreach ((int uniqueProbeIndex, int cellIndex, int i) in bakedProbes)
                 {
                     ref var cell = ref bakingCells[cellIndex];
-                    cell.SetBakedData(m_BakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
+                    cell.SetBakedData(bakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
                         lightingJob.irradiance[uniqueProbeIndex], lightingJob.validity[uniqueProbeIndex],
                         layerMaskJob.renderingLayerMasks, virtualOffsetJob.offsets,
                         skyOcclusionJob.occlusion, skyOcclusionJob.encodedDirections, lightingJob.occlusion);
@@ -696,8 +696,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                 {
                     // Validate baking cells size before any global state modifications
                     var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
-                    var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
-                    var hasRenderingLayers = m_BakingSet.useRenderingLayers;
+                    var hasVirtualOffsets = bakingSet.settings.virtualOffsetSettings.useVirtualOffset;
+                    var hasRenderingLayers = bakingSet.useRenderingLayers;
 
                     if (ValidateBakingCellsSize(bakingCells, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
                     {
@@ -707,8 +707,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                             ComputeValidityMasks(cell);
                         }
 
-                        // Attempt to write the result to disk
-                        if (WriteBakingCells(bakingCells))
+                        // Attempt to write the result to disk.
+                        if (WriteBakingCells(bakingSet, bakingCells))
                         {
                             // Reload everything
                             AssetDatabase.SaveAssets();