[Backport] Fixed an issue where forced sky update would not update ambient probe.

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed atmospheric scattering being incorrectly enabled when scene lighting is disabled.
 - Fixed error thrown when layered lit material has an invalid material type.
 - Fixed a nullref when enabling raycount without ray tracing.
+- Fixed an issue where forced sky update (like PBR sky amortized updated) would not update ambient probe.
 
 ## [10.7.0] - 2021-07-02
 

com.unity.render-pipelines.high-definition/Runtime/Sky/SkyManager.cs

@@ -762,15 +762,14 @@ public void UpdateEnvironment(HDCamera                hdCamera,
                         // Debug.Log("Update Sky Lighting");
                         RenderSkyToCubemap(skyContext);
 
-                        if (updateAmbientProbe&& !renderingContext.computeAmbientProbeRequested)
+                        if (updateAmbientProbe)
                         {
                             using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.UpdateSkyAmbientProbe)))
                             {
                                 cmd.SetComputeBufferParam(m_ComputeAmbientProbeCS, m_ComputeAmbientProbeKernel, m_AmbientProbeOutputBufferParam, renderingContext.ambientProbeResult);
                                 cmd.SetComputeTextureParam(m_ComputeAmbientProbeCS, m_ComputeAmbientProbeKernel, m_AmbientProbeInputCubemap, renderingContext.skyboxCubemapRT);
                                 cmd.DispatchCompute(m_ComputeAmbientProbeCS, m_ComputeAmbientProbeKernel, 1, 1, 1);
                                 cmd.RequestAsyncReadback(renderingContext.ambientProbeResult, renderingContext.OnComputeAmbientProbeDone);
-                                renderingContext.computeAmbientProbeRequested = true;
 
                                 // When the profiler is enabled, we don't want to submit the render context because
                                 // it will break all the profiling sample Begin() calls issued previously, which leads

com.unity.render-pipelines.high-definition/Runtime/Sky/SkyRenderingContext.cs

@@ -15,7 +15,6 @@ internal class SkyRenderingContext
         public bool supportsConvolution { get; private set; } = false;
 
         internal bool ambientProbeIsReady = false;
-        public bool computeAmbientProbeRequested = false;
 
         public SkyRenderingContext(int resolution, int bsdfCount, bool supportsConvolution, SphericalHarmonicsL2 ambientProbe, string name)
         {
@@ -44,7 +43,6 @@ public SkyRenderingContext(int resolution, int bsdfCount, bool supportsConvoluti
         public void Reset()
         {
             ambientProbeIsReady = false;
-            computeAmbientProbeRequested = false;
         }
 
         public void Cleanup()