Bug fixes from Dynamic GI.

Cleanup buffers after bakes, and only dispatch dynamic GI for scene or game cameras

Author: pastasfuture

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/DynamicGI/ProbeVolumeDynamicGI.cs

@@ -307,41 +307,47 @@ public void ClearAllActive(bool clearAll)
 
         internal void DispatchProbePropagation(ScriptableRenderContext renderContext, HDCamera hdCamera, CommandBuffer cmd, ProbeVolumeHandle probeVolume, ProbeDynamicGI giSettings, in ShaderVariablesGlobal shaderGlobals, RTHandle probeVolumeAtlasSHRTHandle)
         {
-            if (probeVolume.parameters.supportDynamicGI
-                && probeVolume.IsDataAssigned()
-                && probeVolume.HasNeighbors()
-                && probeVolume.GetProbeVolumeEngineDataIndex() >= 0)
+            if (hdCamera.camera.cameraType == CameraType.Game || hdCamera.camera.cameraType == CameraType.SceneView)
             {
-                InitializePropagationBuffers(probeVolume);
-
-                if (giSettings.clear.value || _clearAllActive)
+                if (probeVolume.parameters.supportDynamicGI
+                    && probeVolume.IsDataAssigned()
+                    && probeVolume.HasNeighbors()
+                    && probeVolume.GetProbeVolumeEngineDataIndex() >= 0)
                 {
-                    ClearRadianceCache(probeVolume);
-                }
+                    InitializePropagationBuffers(probeVolume);
 
-                DispatchPropagationHits(cmd, probeVolume, in giSettings);
-                DispatchPropagationAxes(cmd, probeVolume, in giSettings);
-                DispatchPropagationCombine(cmd, probeVolume, in giSettings, in shaderGlobals, probeVolumeAtlasSHRTHandle);
-                probeVolume.propagationBuffers.SwapRadianceCaches();
-            }
-            else
-            {
-                if (CleanupPropagation(probeVolume))
+                    if (giSettings.clear.value || _clearAllActive)
+                    {
+                        ClearRadianceCache(probeVolume);
+                    }
+
+                    DispatchPropagationHits(cmd, probeVolume, in giSettings);
+                    DispatchPropagationAxes(cmd, probeVolume, in giSettings);
+                    DispatchPropagationCombine(cmd, probeVolume, in giSettings, in shaderGlobals, probeVolumeAtlasSHRTHandle);
+                    probeVolume.propagationBuffers.SwapRadianceCaches();
+                }
+                else
                 {
-                    // trigger an update so original bake data gets set since Dynamic GI was disabled
-                    probeVolume.SetDataUpdated(true);
+                    if (CleanupPropagation(probeVolume))
+                    {
+                        // trigger an update so original bake data gets set since Dynamic GI was disabled
+                        probeVolume.SetDataUpdated(true);
+                    }
                 }
             }
         }
 
         internal void ClearProbePropagation(ScriptableRenderContext renderContext, HDCamera hdCamera, CommandBuffer cmd, ProbeVolumeHandle probeVolume, ProbeDynamicGI giSettings, in ShaderVariablesGlobal shaderGlobals, RTHandle probeVolumeAtlasSHRTHandle)
         {
-            if (probeVolume.parameters.supportDynamicGI
-                && probeVolume.IsDataAssigned()
-                && probeVolume.HasNeighbors()
-                && probeVolume.GetProbeVolumeEngineDataIndex() >= 0)
+            if (hdCamera.camera.cameraType == CameraType.Game || hdCamera.camera.cameraType == CameraType.SceneView)
             {
-                DispatchPropagationCombine(cmd, probeVolume, in giSettings, in shaderGlobals, probeVolumeAtlasSHRTHandle, true);
+                if (probeVolume.parameters.supportDynamicGI
+                    && probeVolume.IsDataAssigned()
+                    && probeVolume.HasNeighbors()
+                    && probeVolume.GetProbeVolumeEngineDataIndex() >= 0)
+                {
+                    DispatchPropagationCombine(cmd, probeVolume, in giSettings, in shaderGlobals, probeVolumeAtlasSHRTHandle, true);
+                }
             }
         }
 

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/ProbeVolumeManager.cs

@@ -132,10 +132,18 @@ void OnProbesBakeCompleted()
 
         void OnBakeCompleted()
         {
-            var volumesCurrent = (volumesSelected.Count > 0) ? volumesSelected : m_Volumes;
             foreach (var volume in m_Volumes)
             {
+                var index = m_Volumes.IndexOf(volume);
+                if (index == -1)
+                    continue;
+
                 volume.OnBakeCompleted();
+
+                // cleanup buffers
+                var handle = new ProbeVolumeHandle(this, index);
+                volume.CleanupBuffers();
+                ProbeVolumeDynamicGI.instance.CleanupPropagation(handle);
             }
 
             if (volumesSelected.Count > 0)