[HDRP] Backport various Prs (#6741)

sebastienlagarde · FrancescoC-unity · anisunity · web-flow · commit 47996322c03b · 2022-01-14T00:09:49.000+01:00
* Fixed the fade in mode of the clouds not impacting the volumetric clouds shadows (case 1381652). #6511 * Update .gitignore * Avoid typed load on volumetric fog filtering on platforms that don't support it #6513 * Fixed potential asymmetrical resource release in the volumetric clouds (case 1388218). #6600 * Fixed the intensity of the sky being reduced signficantly even if there is no clouds (case 1388279). #6601 * Fixed the rt screen space shadows not using the correct asset for allocating the history buffers. #6613 * Changed the behavior the max ray length for recursive rendering to match RTR and rasterization. #6643 * Fix fbx material #6491 * Urp/fix 1378692 #6627 * [Fogbugz # 380357] Fixing negative overflowing of IES attenuation spline #6669 * Update 1225_Lit_SpeedTree8SG.png * update ref screenshots * Update 004-CloudsFlaresDecals.png Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com> Co-authored-by: esdasuka <soner.sen@gmail.com> Co-authored-by: Kleber Garcia <kleber.garcia@unity3d.com>
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@
 *.userprefs
 *.orig
 *.orig.meta
+*.bak
 .npmrc
 ShaderGraph/DebugOutput.meta
 ShaderGraph/DebugOutput/**
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/004-CloudsFlaresDecals.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/004-CloudsFlaresDecals.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:376f609028f7e1a2dfbe0bfff6aedd1731edc83c7682594ddc99a15bbf87534d
-size 2314747
+oid sha256:4aea2d46b12a589324ebaa20e5f89daeba4f8f30c9d1b4e6f249f6fe491a6c59
+size 2677632
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/004-CloudsFlaresDecals.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/004-CloudsFlaresDecals.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c3e2e49847f35163046cd97aa2e33fe04d5aec8c9e5b1cc6d48828163701b68
-size 2319329
+oid sha256:68e1e6b9def9ce346f6de75b93e323a1cb38e45cd3e1bfc02bea08d6e817b266
+size 2703728
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/004-CloudsFlaresDecals.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/004-CloudsFlaresDecals.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ba9b0cac417a30cb657465e6596162ab734a4f91ec403e2b49d1a00c4e04977
-size 2320057
+oid sha256:199c62ec0d8f2f04e1218d71545ae689134fd377877ddf810843bb58da801865
+size 2703057
diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/004-CloudsFlaresDecals.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/004-CloudsFlaresDecals.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c5d9fd109ce100a4d649298bb8b036d769dd891f57e5c725d1c4e33db64cc31
-size 2313217
+oid sha256:19b0a5da5a4fb101314510e3dd3ffd23900dc1ac06a6d53af2fc417bd626541e
+size 2695828
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5011_VolumetricClouds.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/5011_VolumetricClouds.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:540acb4a7d8b309257278d753f3779b1811acef2a49c784b952d865058f0f45a
-size 245848
+oid sha256:535489972b25ca559283737ef23deb1c963877d2513bbe99513ce81a2f15f7b2
+size 245956
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/1225_Lit_SpeedTree8SG.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f915d6866753d122265d21451cb290844e6005638b27075247fff94d96e517a4
-size 379327
+oid sha256:4f220a652f8b4908561fec7f776e7f6a93760d0b73db02e3cabd77e515c55694
+size 380330
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5011_VolumetricClouds.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/5011_VolumetricClouds.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22a0e67a476dae1cf06f60974c64502fffe39f48f8db32f14e6dabe59bb17a75
-size 246378
+oid sha256:ce94e6ee938be703097eda213b365531ed54b610513760f61d00a920712657ce
+size 245792
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5011_VolumetricClouds.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/5011_VolumetricClouds.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:965f032c9e7fa6e13146a09be1d5527e2ee79983443a41bb3673b1a43c73bf2f
-size 245928
+oid sha256:4a8a327a52122f9fa30ae23c25be46613fcdc5c6fc1868b7a264b3e13a5ebaa3
+size 246006
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5011_VolumetricClouds.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/5011_VolumetricClouds.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e768be073080d68f05239328fb9c9a128f41fd1ef87117cedb35c702bc2d2c5a
-size 246010
+oid sha256:d0dcc93ff1dd770393f5381313c07f702ad582928f065b7ab9cc0247a18c950f
+size 246087
diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5011_VolumetricClouds.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/5011_VolumetricClouds.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7669caad256b02acbf2935761f1ba135f1b00ddd131259f7b3fa8ab652bd80d5
-size 245928
+oid sha256:954b67bd65b04e26d091702541437c84309d97b1cee4963f11a9c4ccae1d0217
+size 245850
diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed XR support in CoreUtils.DrawFullscreen function.
 - Fixed an issue causing Render Graph execution errors after a random amount of time.
 - Fixed issue in DynamicResolutionHandler when camera request was turned off at runtime, the ScalableBufferManager would leak state and not unset DRS state (case 1383093).
+- Fixed the issue with the special Turkish i, when looking for the m_IsGlobal property in VolumeEditor. (case 1276892)
+- Fixed IES profile importer handling of overflow (outside 0-1 range) of attenutation splines values.
 
 ## [12.1.3] - 2021-11-17
 Version Updated
diff --git a/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs b/com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs
@@ -56,7 +56,7 @@ public static string FindProperty<T, TValue>(Expression<Func<T, TValue>> expr)
                 // For properties, get the name of the backing field
                 var name = me.Member is FieldInfo
                     ? me.Member.Name
-                    : "m_" + me.Member.Name.Substring(0, 1).ToUpper() + me.Member.Name.Substring(1);
+                    : "m_" + me.Member.Name.Substring(0, 1).ToUpperInvariant() + me.Member.Name.Substring(1);
                 members.Add(name);
                 me = me.Expression as MemberExpression;
             }
diff --git a/com.unity.render-pipelines.core/Editor/Lighting/IESEngine.cs b/com.unity.render-pipelines.core/Editor/Lighting/IESEngine.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using Unity.Collections;
 using UnityEditor;
@@ -228,6 +229,11 @@ public string GetPhotometricType()
             return (output.importInspectorWarnings, output.output);
         }
 
+        private static byte PackIESValue(float value)
+        {
+            return (byte)Math.Clamp(value * 255, 0, 255);
+        }
+
         NativeArray<Color32> BuildTypeACylindricalTexture(int width, int height)
         {
             float stepU = 360f / (width - 1);
@@ -249,7 +255,7 @@ NativeArray<Color32> BuildTypeACylindricalTexture(int width, int height)
 
                     float horizontalAnglePosition = m_iesReader.ComputeTypeAorBHorizontalAnglePosition(longitude);
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas);
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
@@ -287,7 +293,7 @@ NativeArray<Color32> BuildTypeBCylindricalTexture(int width, int height)
                     float horizontalAnglePosition = m_iesReader.ComputeTypeAorBHorizontalAnglePosition(longitude);
                     float verticalAnglePosition = m_iesReader.ComputeVerticalAnglePosition(latitude);
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas);
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
@@ -325,7 +331,7 @@ NativeArray<Color32> BuildTypeCCylindricalTexture(int width, int height)
                     float horizontalAnglePosition = m_iesReader.ComputeTypeCHorizontalAnglePosition(longitude);
                     float verticalAnglePosition = m_iesReader.ComputeVerticalAnglePosition(latitude);
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / m_iesReader.MaxCandelas);
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
@@ -362,7 +368,7 @@ NativeArray<Color32> BuildTypeAGnomonicTexture(float coneAngle, int size, bool a
                     // Factor in the light attenuation further from the texture center.
                     float lightAttenuation = applyLightAttenuation ? rayLengthSquared : 1f;
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation)) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation));
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
@@ -400,7 +406,7 @@ NativeArray<Color32> BuildTypeBGnomonicTexture(float coneAngle, int size, bool a
                     // Factor in the light attenuation further from the texture center.
                     float lightAttenuation = applyLightAttenuation ? rayLengthSquared : 1f;
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation)) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation));
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
@@ -437,7 +443,7 @@ NativeArray<Color32> BuildTypeCGnomonicTexture(float coneAngle, int size, bool a
                     // Factor in the light attenuation further from the texture center.
                     float lightAttenuation = applyLightAttenuation ? (uvLength * uvLength + 1) : 1f;
 
-                    byte value = (byte)((m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation)) * 255);
+                    byte value = PackIESValue(m_iesReader.InterpolateBilinear(horizontalAnglePosition, verticalAnglePosition) / (m_iesReader.MaxCandelas * lightAttenuation));
                     slice[x] = new Color32(value, value, value, value);
                 }
             }
diff --git a/com.unity.render-pipelines.core/Editor/Lighting/IESImporter.cs b/com.unity.render-pipelines.core/Editor/Lighting/IESImporter.cs
@@ -13,7 +13,7 @@ namespace UnityEditor.Rendering
     /// Common class use to share code between implementation of IES Importeres
     /// </summary>
     [System.Serializable]
-    [ScriptedImporter(1, "ies")]
+    [ScriptedImporter(2, "ies")]
     public partial class IESImporter : ScriptedImporter
     {
         /// <summary>
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -66,6 +66,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed NeedMotionVectorForTransparent checking the wrong flag.
 - Fixed rendering in the editor when an incompatible API is added (case 1384634).
 - Fixed a crash with render graph viewer when render graph is not provided with an execution name.
+- Fixed the fade in mode of the clouds not impacting the volumetric clouds shadows (case 1381652).
+- Fixed issue with typed loads on RGBA16F in Volumetric Lighting Filtering.
+- Fixed the fade in mode of the clouds not impacting the volumetric clouds shadows (case 1381652).
+- Fixed the intensity of the sky being reduced signficantly even if there is no clouds (case 1388279).
+- Fixed the rt screen space shadows not using the correct asset for allocating the history buffers.
+- Fixed the behavior the max ray length for recursive rendering to match RTR and rasterization.
+- Fixed Normal Map assiignation when importing FBX Materials.
 
 ## [12.1.3] - 2021-11-17
 
diff --git a/com.unity.render-pipelines.high-definition/Documentation~/Ray-Tracing-Recursive-Rendering.md b/com.unity.render-pipelines.high-definition/Documentation~/Ray-Tracing-Recursive-Rendering.md
@@ -39,7 +39,7 @@ Since recursive rendering uses an independent render pass, HDRP cannot render an
 | -------------- | ------------------------------------------------------------ |
 | **LayerMask**  | Defines the layers that HDRP processes this ray-traced effect for. |
 | **Max Depth**  | Controls the maximum number of times a ray can reflect or refract before it stops and returns the final color. Increasing this value increases execution time exponentially. |
-| **Max Ray Length** | Controls the length of the rays that HDRP uses for ray tracing. If a ray doesn't find an intersection, then the ray returns the color of the sky. |
+| **Max Ray Length** | Controls the length of the rays that HDRP uses for ray tracing after the initial intersection. For the primary ray, HDRP uses the camera's near and far planes.|
 | **Min Smoothness** | Defines the threshold at which reflection rays are not cast if the smoothness value of the target surface is inferior to the one defined by the parameter. |
 | **Ray Miss**                  | Determines what HDRP does when recursive rendering doesn't find an intersection. Choose from one of the following options: <br/>&#8226;**Reflection probes**: HDRP uses reflection probes in your scene to calculate the last recursive rendering bounce.<br/>&#8226;**Sky**: HDRP uses the sky defined by the current [Volume](Volumes.md) settings to calculate the last recursive rendering bounce.<br/>&#8226;**Both** : HDRP uses both reflection probes and the sky defined by the current [Volume](Volumes.md) settings to calculate the last recursive rendering bounce.<br/>&#8226;**Nothing**: HDRP does not calculate indirect lighting when recursive rendering doesn't find an intersection.<br/><br/>This property is set to **Both** by default. |
 | **Last Bounce**               | Determines what HDRP does when recursive rendering lights the last bounce. Choose from one of the following options: <br/>&#8226;**Reflection probes**: HDRP uses reflection probes in your scene to calculate the last bounce.<br/>&#8226;**Sky**: HDRP uses the sky defined by the current [Volume](Volumes.md) settings to calculate the last recursive rendering bounce.<br/>&#8226;**Both**:  HDRP uses both reflection probes and the sky defined by the current [Volume](Volumes.md) settings to calculate the last recursive rendering bounce.<br/>&#8226;**Nothing**: HDRP does not calculate indirect lighting when it evaluates the last bounce.<br/><br/>This property is set to **Both** by default. |
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs b/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/FBXMaterialDescriptionPostprocessor.cs
@@ -110,17 +110,17 @@ public void OnPreprocessMaterialDescription(MaterialDescription description, Mat
 
             if (description.TryGetProperty("Bump", out textureProperty) && textureProperty.texture != null)
             {
-                SetMaterialTextureProperty("_BumpMap", material, textureProperty);
+                SetMaterialTextureProperty("_NormalMap", material, textureProperty);
 
                 if (description.TryGetProperty("BumpFactor", out floatProperty))
-                    material.SetFloat("_BumpScale", floatProperty);
+                    material.SetFloat("_NormalScale", floatProperty);
             }
             else if (description.TryGetProperty("NormalMap", out textureProperty) && textureProperty.texture != null)
             {
-                SetMaterialTextureProperty("_BumpMap", material, textureProperty);
+                SetMaterialTextureProperty("_NormalMap", material, textureProperty);
 
                 if (description.TryGetProperty("BumpFactor", out floatProperty))
-                    material.SetFloat("_BumpScale", floatProperty);
+                    material.SetFloat("_NormalScale", floatProperty);
             }
 
             if (description.TryGetProperty("EmissiveColor", out textureProperty))
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/Shadow/HDRenderPipeline.ScreenSpaceShadows.cs
@@ -57,10 +57,10 @@ public partial class HDRenderPipeline
         // This buffer holds the unfiltered, accumulated, shadow values, it is accessed with the same index as the one used at runtime (aka screen space shadow slot)
         static RTHandle ShadowHistoryBufferAllocatorFunction(string viewName, int frameIndex, RTHandleSystem rtHandleSystem)
         {
-            HDRenderPipelineAsset hdPipelineAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset;
+            HDRenderPipeline hdrp = RenderPipelineManager.currentPipeline as HDRenderPipeline;
+            HDRenderPipelineAsset hdPipelineAsset = hdrp.m_Asset;
             GraphicsFormat graphicsFormat = (GraphicsFormat)hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.screenSpaceShadowBufferFormat;
-            HDRenderPipeline hdrp = (RenderPipelineManager.currentPipeline as HDRenderPipeline);
-            int numShadowSlices = Math.Max((int)Math.Ceiling(hdrp.m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
+            int numShadowSlices = Math.Max((int)Math.Ceiling(hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
             return rtHandleSystem.Alloc(Vector2.one, slices: numShadowSlices * TextureXR.slices, dimension: TextureDimension.Tex2DArray, filterMode: FilterMode.Point, colorFormat: graphicsFormat,
                 enableRandomWrite: true, useDynamicScale: true, useMipMap: false, name: string.Format("{0}_ScreenSpaceShadowHistoryBuffer{1}", viewName, frameIndex));
         }
@@ -70,20 +70,20 @@ static RTHandle ShadowHistoryBufferAllocatorFunction(string viewName, int frameI
         // It is accessed with the same index used at runtime (aka screen space shadow slot)
         static RTHandle ShadowHistoryValidityBufferAllocatorFunction(string viewName, int frameIndex, RTHandleSystem rtHandleSystem)
         {
-            HDRenderPipelineAsset hdPipelineAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset;
-            HDRenderPipeline hdrp = (RenderPipelineManager.currentPipeline as HDRenderPipeline);
+            HDRenderPipeline hdrp = RenderPipelineManager.currentPipeline as HDRenderPipeline;
+            HDRenderPipelineAsset hdPipelineAsset = hdrp.m_Asset;
             GraphicsFormat graphicsFormat = (GraphicsFormat)hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.screenSpaceShadowBufferFormat;
-            int numShadowSlices = Math.Max((int)Math.Ceiling(hdrp.m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
+            int numShadowSlices = Math.Max((int)Math.Ceiling(hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
             return rtHandleSystem.Alloc(Vector2.one, slices: numShadowSlices * TextureXR.slices, dimension: TextureDimension.Tex2DArray, filterMode: FilterMode.Point, colorFormat: graphicsFormat,
                 enableRandomWrite: true, useDynamicScale: true, useMipMap: false, name: string.Format("{0}_ShadowHistoryValidityBuffer{1}", viewName, frameIndex));
         }
 
         static RTHandle ShadowHistoryDistanceBufferAllocatorFunction(string viewName, int frameIndex, RTHandleSystem rtHandleSystem)
         {
-            HDRenderPipelineAsset hdPipelineAsset = GraphicsSettings.renderPipelineAsset as HDRenderPipelineAsset;
-            HDRenderPipeline hdrp = (RenderPipelineManager.currentPipeline as HDRenderPipeline);
+            HDRenderPipeline hdrp = RenderPipelineManager.currentPipeline as HDRenderPipeline;
+            HDRenderPipelineAsset hdPipelineAsset = hdrp.m_Asset;
             GraphicsFormat graphicsFormat = (GraphicsFormat)hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.screenSpaceShadowBufferFormat;
-            int numShadowSlices = Math.Max((int)Math.Ceiling(hdrp.m_Asset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
+            int numShadowSlices = Math.Max((int)Math.Ceiling(hdPipelineAsset.currentPlatformRenderPipelineSettings.hdShadowInitParams.maxScreenSpaceShadowSlots / 4.0f), 1);
             return rtHandleSystem.Alloc(Vector2.one, slices: numShadowSlices * TextureXR.slices, dimension: TextureDimension.Tex2DArray, filterMode: FilterMode.Point, colorFormat: graphicsFormat,
                 enableRandomWrite: true, useDynamicScale: true, useMipMap: false, name: string.Format("{0}_ShadowHistoryDistanceBuffer{1}", viewName, frameIndex));
         }
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs
@@ -32,6 +32,7 @@ public partial class HDRenderPipeline
         int m_CombineCloudsKernelColorCopy;
         int m_CombineCloudsKernelColorRW;
         int m_CombineCloudsSkyKernel;
+        bool m_ActiveVolumetricClouds;
 
         // Combine pass via hardware blending, used in case of MSAA color target.
         Material m_CloudCombinePass;
@@ -53,7 +54,9 @@ struct VolumetricCloudsCameraData
 
         void InitializeVolumetricClouds()
         {
-            if (!m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds)
+            // Keep track of the state for the release
+            m_ActiveVolumetricClouds = m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds;
+            if (!m_ActiveVolumetricClouds)
                 return;
 
             // Allocate the buffers for ambient probe evaluation
@@ -92,7 +95,7 @@ void InitializeVolumetricClouds()
 
         void ReleaseVolumetricClouds()
         {
-            if (!m_Asset.currentPlatformRenderPipelineSettings.supportVolumetricClouds)
+            if (!m_ActiveVolumetricClouds)
                 return;
 
             // Destroy the material
@@ -492,7 +495,7 @@ void UpdateShaderVariableslClouds(ref ShaderVariablesClouds cb, HDCamera hdCamer
                 float groundShadowSize = settings.shadowDistance.value;
 
                 // The world space camera will be required but the global constant buffer will not be injected yet.
-                cb._WorldSpaceShadowCenter = new Vector2(hdCamera.camera.transform.position.x, hdCamera.camera.transform.position.z);
+                cb._WorldSpaceShadowCenter = new Vector4(hdCamera.camera.transform.position.x, hdCamera.camera.transform.position.y, hdCamera.camera.transform.position.z, 0.0f);
 
                 if (HasVolumetricCloudsShadows(hdCamera, settings))
                 {
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricLighting.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricLighting.cs
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.compute
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricCloudsDef.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricCloudsDef.cs
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricCloudsDef.cs.hlsl b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricCloudsDef.cs.hlsl
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute b/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLightingFiltering.compute
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDStringConstants.cs
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingRenderer.raytrace b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingRenderer.raytrace
