[Hdrp] Merge Hd/bugfix #6954

Author: sebastienlagarde

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

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed issue that placed an OnDemand shadow in the atlas before it was ever rendered.
 - Fixed issue at edge of screen on some platforms when SSAO is on.
 - Fixed vertex color mode Add name whicgh was misleading, renamed to AddSubstract.
+- Fixed screen space shadow when multiple lights cast shadows.
+- Fixed issue with dynamic resolution and low res transparency sampling garbage outside of the render target.
 
 ## [10.8.0] - 2021-09-20
 

com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/ScreenSpaceShadows.shader

@@ -65,7 +65,7 @@ Shader "Hidden/HDRP/ScreenSpaceShadows"
             float3 normalWS = normalData.normalWS;
 
             // Note: we use shading normal here and not GetNormalForShadowBias() as it is not available
-            return GetDirectionalShadowAttenuation(context.shadowContext, posInput.positionSS.xy, posInput.positionWS, normalWS, _DirectionalShadowIndex, L);
+            return GetDirectionalShadowAttenuation(context.shadowContext, posInput.positionSS.xy, posInput.positionWS, normalWS, light.shadowIndex, L);
         }
     ENDHLSL
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs

@@ -2988,7 +2988,7 @@ void Callback(CommandBuffer c, HDCamera cam)
                 PushFullScreenDebugTexture(hdCamera, cmd, m_CameraColorBuffer, FullScreenDebugMode.NanTracker);
                 PushFullScreenLightingDebugTexture(hdCamera, cmd, m_CameraColorBuffer);
 
-                if (m_SubFrameManager.isRecording && m_SubFrameManager.subFrameCount > 1)
+                if (m_SubFrameManager.isRecording && m_SubFrameManager.subFrameCount > 1 && && !m_PathTracing.enable.value)
                 {
                     RenderAccumulation(hdCamera, m_CameraColorBuffer, m_CameraColorBuffer, false, cmd);
                 }
@@ -4807,7 +4807,7 @@ RenderSSRParameters PrepareSSRParameters(HDCamera hdCamera, in HDUtils.PackedMip
             cb._ColorPyramidUvScaleAndLimitPrevFrame = HDUtils.ComputeViewportScaleAndLimit(hdCamera.historyRTHandleProperties.previousViewportSize, hdCamera.historyRTHandleProperties.previousRenderTargetSize);
             cb._SsrColorPyramidMaxMip = hdCamera.colorPyramidHistoryMipCount - 1;
             cb._SsrDepthPyramidMaxMip = depthPyramid.mipLevelCount - 1;
-            if (hdCamera.isFirstFrame || hdCamera.cameraFrameCount <= 2)
+            if (hdCamera.isFirstFrame || hdCamera.cameraFrameCount <= 3)
                 cb._SsrAccumulationAmount = 1.0f;
             else
                 cb._SsrAccumulationAmount = Mathf.Pow(2, Mathf.Lerp(0.0f, -7.0f, volumeSettings.accumulationFactor.value));

com.unity.render-pipelines.high-definition/Runtime/ShaderLibrary/UpsampleTransparent.shader

@@ -95,7 +95,9 @@ Shader "Hidden/HDRP/UpsampleTransparent"
 #if DEBUG_EDGE
                 return float4(0.0, 10.0, 0.0, 1.0);
 #else
-                return SAMPLE_TEXTURE2D_X_LOD(_LowResTransparent, s_point_clamp_sampler, ClampAndScaleUVForPoint(nearestUV), 0);
+                // Important note! The reason we need to do ClampAndScaleUVForBilinear is because the candidate for nearestUV are going to be the ones
+                // used for bilinear. We are using the same UVs used for bilinear -hence the uv clamp for bilinear- it is just the filtering that is different.
+                return SAMPLE_TEXTURE2D_X_LOD(_LowResTransparent, s_point_clamp_sampler, ClampAndScaleUVForBilinear(nearestUV), 0);
 #endif
             }
         #else // BILINEAR