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

kecho · sebastienlagarde · commit 45e5e509103e · 2021-12-14T19:31:52.000+01:00
diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md
@@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [13.1.4] - 2021-12-04
 
-Version Updated
-The version number for this package has increased due to a version update of a related graphics package.
+### Fixed
+- Fixed issue in DynamicResolutionHandler when camera request was turned off at runtime, the ScalableBufferManager would leak state and not unset DRS state (case 1383093).
 
 ## [13.1.3] - 2021-11-17
 
diff --git a/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs b/com.unity.render-pipelines.core/Runtime/Common/DynamicResolutionHandler.cs
@@ -144,7 +144,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;
         }
 
@@ -418,6 +419,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/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed the ray tracing fallbacks being broken since an Nvidia Driver Update.
 - Render Graph object pools are now cleared with render graph cleanup
 - Fixed a shader warning in UnityInstancing.hlsl
-- Fixed misc shader warnings.
+- Fixed AO dissapearing when DRS would be turned off through a camera, while hardware drs is active in DX12 or Vulkan (case 1383093).
 
 ## [13.1.3] - 2021-11-17
 
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
@@ -593,11 +593,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()
@@ -612,13 +614,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
`@@ -144,7 +144,8 @@ private bool FlushScalableBufferManagerState()`
`144`	`144`
`145`	`145`	`s_GlobalHwUpresActive = HardwareDynamicResIsEnabled();`
`146`	`146`	`s_GlobalHwFraction = m_CurrentFraction;`
`147`		`- ScalableBufferManager.ResizeBuffers(s_GlobalHwFraction, s_GlobalHwFraction);`
	`147`	`+ float currentFraction = s_GlobalHwUpresActive ? s_GlobalHwFraction : 1.0f;`
	`148`	`+ ScalableBufferManager.ResizeBuffers(currentFraction, currentFraction);`
`148`	`149`	`return true;`
`149`	`150`	`}`
`150`	`151`
`@@ -418,6 +419,7 @@ public void Update(GlobalDynamicResolutionSettings settings, Action OnResolution`
`418`	`419`
`419`	`420`	`if (!m_Enabled \|\| !s_ActiveInstanceDirty)`
`420`	`421`	`{`
	`422`	`+ FlushScalableBufferManagerState();`
`421`	`423`	`s_ActiveInstanceDirty = false;`
`422`	`424`	`return;`
`423`	`425`	`}`