[Fogbugz # 1383093] Fixing leaky state of hardware resolution when turned off from camera (#6492)

kecho · sebastienlagarde · pastasfuture · commit 0fde80ac692a · 2021-12-17T00:49:52.000-08:00
* * Fixing leaky state of hardware resolution dx12 when we disable DRS on a camera object through inspector or script

* Fixing dirty state of depth mip pyramid

* Changelog update for case 1383093, bad hw drs for ao

Co-authored-by: sebastienlagarde &lt;sebastien@unity3d.com&gt;
diff --git a/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs b/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs
@@ -102,7 +102,8 @@ private bool FlushScalableBufferManagerState()
 
             s_GlobalHwUpresActive = HardwareDynamicResIsEnabled();
             s_GlobalHwFraction = m_CurrentFraction;
-            ScalableBufferManager.ResizeBuffers(s_GlobalHwFraction, s_GlobalHwFraction);
+            float currentFraction = s_GlobalHwUpresActive ? s_GlobalHwFraction : 1.0f;
+            ScalableBufferManager.ResizeBuffers(currentFraction, currentFraction);
             return true;
         }
 
@@ -290,6 +291,7 @@ public void Update(GlobalDynamicResolutionSettings settings, Action OnResolution
 
             if (!m_Enabled && !s_ActiveInstanceDirty)
             {
+                FlushScalableBufferManagerState();
                 s_ActiveInstanceDirty = false;
                 return;
             }
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Utility/HDUtils.cs
@@ -631,11 +631,13 @@ internal static void RestoreRenderPipelineAsset(bool wasUnsetFromQuality, Render
         internal struct PackedMipChainInfo
         {
             public Vector2Int textureSize;
-            public Vector2Int hardwareTextureSize;
             public int mipLevelCount;
             public Vector2Int[] mipLevelSizes;
             public Vector2Int[] mipLevelOffsets;
 
+            private Vector2 cachedTextureScale;
+            private Vector2Int cachedHardwareTextureSize;
+
             private bool m_OffsetBufferWillNeedUpdate;
 
             public void Allocate()
@@ -650,13 +652,16 @@ public void Allocate()
             // This function is NOT fast, but it is illustrative, and can be optimized later.
             public void ComputePackedMipChainInfo(Vector2Int viewportSize)
             {
+                bool isHardwareDrsOn = DynamicResolutionHandler.instance.HardwareDynamicResIsEnabled();
+                Vector2Int hardwareTextureSize = isHardwareDrsOn ? DynamicResolutionHandler.instance.ApplyScalesOnSize(viewportSize) : viewportSize;
+                Vector2 textureScale = isHardwareDrsOn ? new Vector2((float)viewportSize.x / (float)hardwareTextureSize.x, (float)viewportSize.y / (float)hardwareTextureSize.y) : new Vector2(1.0f, 1.0f);
+
                 // No work needed.
-                if (viewportSize == mipLevelSizes[0])
+                if (cachedHardwareTextureSize == hardwareTextureSize && cachedTextureScale == textureScale)
                     return;
 
-                bool isHardwareDrsOn = DynamicResolutionHandler.instance.HardwareDynamicResIsEnabled();
-                hardwareTextureSize = isHardwareDrsOn ? DynamicResolutionHandler.instance.ApplyScalesOnSize(viewportSize) : viewportSize;
-                Vector2 textureScale = isHardwareDrsOn ? new Vector2((float)viewportSize.x / (float)hardwareTextureSize.x, (float)viewportSize.y / (float)hardwareTextureSize.y) : new Vector2(1.0f, 1.0f);
+                cachedHardwareTextureSize = hardwareTextureSize;
+                cachedTextureScale = textureScale;
 
                 mipLevelSizes[0] = hardwareTextureSize;
                 mipLevelOffsets[0] = Vector2Int.zero;

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ private bool FlushScalableBufferManagerState()`
`102`	`102`
`103`	`103`	`s_GlobalHwUpresActive = HardwareDynamicResIsEnabled();`
`104`	`104`	`s_GlobalHwFraction = m_CurrentFraction;`
`105`		`- ScalableBufferManager.ResizeBuffers(s_GlobalHwFraction, s_GlobalHwFraction);`
	`105`	`+ float currentFraction = s_GlobalHwUpresActive ? s_GlobalHwFraction : 1.0f;`
	`106`	`+ ScalableBufferManager.ResizeBuffers(currentFraction, currentFraction);`
`106`	`107`	`return true;`
`107`	`108`	`}`
`108`	`109`
`@@ -290,6 +291,7 @@ public void Update(GlobalDynamicResolutionSettings settings, Action OnResolution`
`290`	`291`
`291`	`292`	`if (!m_Enabled && !s_ActiveInstanceDirty)`
`292`	`293`	`{`
	`294`	`+ FlushScalableBufferManagerState();`
`293`	`295`	`s_ActiveInstanceDirty = false;`
`294`	`296`	`return;`
`295`	`297`	`}`