[8.x.x Backport] Fix issue with the blue line of prefab modifications for Volume mode

TestProjects/HDRP_RuntimeTests/Packages/manifest.json

@@ -7,10 +7,10 @@
     "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
     "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
     "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
-    "com.unity.test-framework": "1.1.5",
-    "com.unity.test-framework.build": "0.0.1-preview.3",
-    "com.unity.test-framework.utp-reporter": "0.1.3-preview.17",
-    "com.unity.testframework.graphics": "7.1.12-preview",
+    "com.unity.test-framework": "1.1.14",
+    "com.unity.test-framework.build": "0.0.1-preview.12",
+    "com.unity.test-framework.utp-reporter": "1.0.0-preview",
+    "com.unity.testframework.graphics": "7.1.13-preview",
     "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",

com.unity.render-pipelines.core/Editor/Debugging/DebugUIDrawer.cs

@@ -36,10 +36,12 @@ protected T Cast<T>(object o)
             where T : class
         {
             var casted = o as T;
-            string typeName = o == null ? "null" : o.GetType().ToString();
 
             if (casted == null)
+            {
+                string typeName = o == null ? "null" : o.GetType().ToString();
                 throw new InvalidOperationException("Can't cast " + typeName + " to " + typeof(T));
+            }
 
             return casted;
         }

com.unity.render-pipelines.core/Editor/Volume/VolumeEditor.cs

@@ -56,7 +56,7 @@ public override void OnInspectorGUI()
             EditorGUI.BeginProperty(lineRect, label, m_IsGlobal);
             {
                 EditorGUI.BeginChangeCheck();
-                isGlobal = EditorGUILayout.Popup(label, isGlobal, m_Modes);
+                isGlobal = EditorGUI.Popup(lineRect, label, isGlobal, m_Modes);
                 if (EditorGUI.EndChangeCheck())
                     m_IsGlobal.boolValue = isGlobal == 0;
             }

com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraph.cs

@@ -236,6 +236,17 @@ public void UnRegisterDebug()
             //m_DebugParameters.UnRegisterDebug();
         }
 
+        /// <summary>
+        /// Resets the reference size of the internal RTHandle System.
+        /// This allows users to reduce the memory footprint of render textures after doing a super sampled rendering pass for example.
+        /// </summary>
+        /// <param name="width">New width of the internal RTHandle System.</param>
+        /// <param name="height">New height of the internal RTHandle System.</param>
+        public void ResetRTHandleReferenceSize(int width, int height)
+        {
+            m_Resources.ResetRTHandleReferenceSize(width, height);
+        }
+
         /// <summary>
         /// Import an external texture to the Render Graph.
         /// </summary>

com.unity.render-pipelines.core/Runtime/RenderGraph/RenderGraphResourceRegistry.cs

@@ -659,6 +659,11 @@ internal void Clear()
 #endif
         }
 
+        internal void ResetRTHandleReferenceSize(int width, int height)
+        {
+            m_RTHandleSystem.ResetReferenceSize(width, height);
+        }
+
         internal void Cleanup()
         {
             foreach (var value in m_TexturePool)

com.unity.render-pipelines.core/Runtime/Textures/BufferedRTHandleSystem.cs

@@ -134,6 +134,17 @@ public void SwapAndSetReferenceSize(int width, int height, MSAASamples msaaSampl
             m_RTHandleSystem.SetReferenceSize(width, height, msaaSamples);
         }
 
+        /// <summary>
+        /// Reset the reference size of the system and reallocate all textures.
+        /// </summary>
+        /// <param name="width">New width.</param>
+        /// <param name="height">New height.</param>
+        public void ResetReferenceSize(int width, int height)
+        {
+            m_RTHandleSystem.ResetReferenceSize(width, height);
+        }
+
+
         void Swap()
         {
             foreach (var item in m_RTHandles)

com.unity.render-pipelines.core/Runtime/Textures/RTHandleSystem.cs

@@ -125,13 +125,25 @@ internal void Remove(RTHandle rth)
             m_AutoSizedRTs.Remove(rth);
         }
 
+        /// <summary>
+        /// Reset the reference size of the system and reallocate all textures.
+        /// </summary>
+        /// <param name="width">New width.</param>
+        /// <param name="height">New height.</param>
+        public void ResetReferenceSize(int width, int height)
+        {
+            m_MaxWidths = width;
+            m_MaxHeights = height;
+            SetReferenceSize(width, height, m_ScaledRTCurrentMSAASamples, reset: true);
+        }
+
         /// <summary>
         /// Sets the reference rendering size for subsequent rendering for the RTHandle System
         /// </summary>
         /// <param name="width">Reference rendering width for subsequent rendering.</param>
         /// <param name="height">Reference rendering height for subsequent rendering.</param>
         /// <param name="msaaSamples">Number of MSAA samples for multisampled textures for subsequent rendering.</param>
-        public void SetReferenceSize(int width, int height, MSAASamples msaaSamples)
+        public void SetReferenceSize(int width, int height, MSAASamples msaaSamples, bool reset = false)
         {
             m_RTHandleProperties.previousViewportSize = m_RTHandleProperties.currentViewportSize;
             m_RTHandleProperties.previousRenderTargetSize = m_RTHandleProperties.currentRenderTargetSize;
@@ -140,7 +152,7 @@ public void SetReferenceSize(int width, int height, MSAASamples msaaSamples)
             width = Mathf.Max(width, 1);
             height = Mathf.Max(height, 1);
 
-            bool sizeChanged = width > GetMaxWidth() || height > GetMaxHeight();
+            bool sizeChanged = width > GetMaxWidth() || height > GetMaxHeight() || reset;
             bool msaaSamplesChanged = (msaaSamples != m_ScaledRTCurrentMSAASamples);
 
             if (sizeChanged || msaaSamplesChanged)

com.unity.render-pipelines.core/Runtime/Textures/RTHandles.cs

@@ -294,5 +294,15 @@ MSAASamples msaaSamples
                 msaaSamples
                 );
         }
+
+        /// <summary>
+        /// Reset the reference size of the system and reallocate all textures.
+        /// </summary>
+        /// <param name="width">New width.</param>
+        /// <param name="height">New height.</param>
+        public static void ResetReferenceSize(int width, int height)
+        {
+            s_DefaultInstance.ResetReferenceSize(width, height);
+        }
     }
 }

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

@@ -1,13 +1,38 @@
-# Changelog
+# Changelog
 All notable changes to this package will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-Version Updated
-The version number for this package has increased due to a version update of a related graphics package.
+### Added
+- Added a function (HDRenderPipeline.ResetRTHandleReferenceSize) to reset the reference size of RTHandle systems.
+
+### Fixed
+- Fixed shadowmask UI now correctly showing shadowmask disable
+- Fixed the indirect diffuse texture not being ignored when it should (ray tracing disabled).
+- Fixed a performance issue with stochastic ray traced area shadows.
+- Made more explicit the warning about raytracing and asynchronous compute. Also fixed the condition in which it appears.
+- Fixed a null ref exception in static sky when the default volume profile is invalid.
+- Fixed an error about procedural sky being logged by mistake.
+- Fixed flickering of the game/scene view when lookdev is running.
+- Fixed some GCAlloc in the debug window.
+- Removed logic in the UI to disable parameters for contact shadows and fog volume components as it was going against the concept of the volume system.
+- Fixed over consumption of GPU memory by the Physically Based Sky.
+- Put more information in Camera background type tooltip and fixed inconsistent exposure behavior when changing bg type.
+- Fixed an issue where asset preview could be rendered white because of static lighting sky.
+- Fixed an issue where static lighting was not updated when removing the static lighting sky profile.
+- Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
+- Fixed depth prepass and postpass being disabled after changing the shader in the material UI.
+- Fix an issue in reading the gbuffer for ray traced subsurface scattering (case 1248358).
+- Fixed an issue where editing the Look Dev default profile would not reflect directly in the Look Dev window.
+- Fixed issue with blue line in prefabs for volume mode.
+
+### Changed
+- Shadowmask and realtime reflection probe property are hide in Quality settings
+- Made the StaticLightingSky class public so that users can change it by script for baking purpose.
+- Changed default exposure compensation to 0.
 
 ### Fixed
 - Fixed a cause of NaN when a normal of 0-length is generated (usually via shadergraph).
@@ -78,7 +103,6 @@ The version number for this package has increased due to a version update of a r
 - Fixed scalarization code for contact shadows
 - Fix MaterialBalls having same guid issue
 - Fix spelling and grammatical errors in material samples
-- Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
 
 ### Changed
 - Rejecting history for ray traced reflections based on a threshold evaluated on the neighborhood of the sampled history.
@@ -654,6 +678,8 @@ The version number for this package has increased due to a version update of a r
 - Added a fix script to handle the warning 'referenced script in (GameObject 'SceneIDMap') is missing'
 - Fix Wizard load when none selected for RenderPipelineAsset
 - Fixed issue with unclear naming of debug menu for decals.
+- Fixed issue with reflection probes in realtime time mode with OnEnable baking having wrong lighting with sky set to dynamic (case 1238047).
+- Fixed corrupted values on LayeredLit when using Vertex Color multiply mode to multiply and MSAA is activated. 
 
 ### Changed
 - Color buffer pyramid is not allocated anymore if neither refraction nor distortion are enabled

com.unity.render-pipelines.high-definition/Documentation~/Creating-a-Custom-Sky.md

@@ -59,6 +59,12 @@ public class NewSky : SkySettings
         }
         return hash;
     }
+
+    public override int GetHashCode(Camera camera)
+    {
+        // Implement if your sky depends on the camera settings (like position for instance)
+        return GetHashCode();
+    }
 }
 
 ```
@@ -159,6 +165,10 @@ class NewSkyRenderer : SkyRenderer
 }
 
 ```
+### Important note:
+If your sky renderer has to manage heavy data (like precomputed textures or similar things) then particular care has to be taken. Indeed, one instance of the renderer will exist per camera so by default if this data is a member of the renderer, it willl also be duplicated in memory.
+Since each sky renderer can have very different needs, the responsbility to share this kind of data is the renderer's and need to be implemented by the user.
+
 <a name="RenderingShader"></a>
 
 ## Sky rendering Shader

com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2019.3-to-2020.1.md

@@ -8,4 +8,8 @@ From Unity 2020.1, the HDRP-specific settings of the scene view camera (anti-ali
 
 ## Cookie baking
 
-From Unity 2020.1, Cookie on light are not taken into account for the lightmaps / Lightprobes. This support is always enable with HDRP.
+From Unity 2020.1, Cookie on light are not taken into account for the lightmaps / Lightprobes. This support is always enable with HDRP.
+
+## Default Volume Profile
+
+From Unity 2020.1, the Default Volume Profile asset has changed so that the Exposure component sets the default Compensation to 0.

com.unity.render-pipelines.high-definition/Editor/Lighting/Shadow/ContactShadowsEditor.cs

@@ -40,22 +40,19 @@ public override void OnInspectorGUI()
 
             if (!m_Enable.value.hasMultipleDifferentValues)
             {
-                using (new EditorGUI.DisabledGroupScope(!m_Enable.value.boolValue))
-                {
-                    PropertyField(m_Length, EditorGUIUtility.TrTextContent("Length", "Controls the length of the rays HDRP uses to calculate Contact Shadows. Uses meters."));
-                    PropertyField(m_DistanceScaleFactor, EditorGUIUtility.TrTextContent("Distance Scale Factor", "Dampens the scale up effect HDRP process with distance from the Camera."));
-                    m_MinDistance.value.floatValue = Mathf.Clamp(m_MinDistance.value.floatValue, 0.0f, m_MaxDistance.value.floatValue);
-                    PropertyField(m_MinDistance, EditorGUIUtility.TrTextContent("Min Distance", "Sets the distance from the camera at which HDRP begins to fade in Contact Shadows. Uses meters."));
-                    PropertyField(m_MaxDistance, EditorGUIUtility.TrTextContent("Max Distance", "Sets the distance from the Camera at which HDRP begins to fade out Contact Shadows. Uses meters."));
-                    m_FadeInDistance.value.floatValue = Mathf.Clamp(m_FadeInDistance.value.floatValue, 0.0f, m_MaxDistance.value.floatValue);
-                    PropertyField(m_FadeInDistance, EditorGUIUtility.TrTextContent("Fade In Distance", "Sets the distance over which HDRP fades Contact Shadows in when past the Min Distance. Uses meters."));
-                    PropertyField(m_FadeDistance, EditorGUIUtility.TrTextContent("Fade Out Distance", "Sets the distance over which HDRP fades Contact Shadows out when at the Max Distance. Uses meters."));
-                    PropertyField(m_Opacity, EditorGUIUtility.TrTextContent("Opacity", "Controls the opacity of the Contact Shadow."));
-                    base.OnInspectorGUI();
-                    GUI.enabled = useCustomValue;
-                    PropertyField(m_SampleCount, EditorGUIUtility.TrTextContent("Sample Count", "Controls the number of samples HDRP uses for ray casting."));
-                    GUI.enabled = true;
-                }
+                PropertyField(m_Length, EditorGUIUtility.TrTextContent("Length", "Controls the length of the rays HDRP uses to calculate Contact Shadows. Uses meters."));
+                PropertyField(m_DistanceScaleFactor, EditorGUIUtility.TrTextContent("Distance Scale Factor", "Dampens the scale up effect HDRP process with distance from the Camera."));
+                m_MinDistance.value.floatValue = Mathf.Clamp(m_MinDistance.value.floatValue, 0.0f, m_MaxDistance.value.floatValue);
+                PropertyField(m_MinDistance, EditorGUIUtility.TrTextContent("Min Distance", "Sets the distance from the camera at which HDRP begins to fade in Contact Shadows. Uses meters."));
+                PropertyField(m_MaxDistance, EditorGUIUtility.TrTextContent("Max Distance", "Sets the distance from the Camera at which HDRP begins to fade out Contact Shadows. Uses meters."));
+                m_FadeInDistance.value.floatValue = Mathf.Clamp(m_FadeInDistance.value.floatValue, 0.0f, m_MaxDistance.value.floatValue);
+                PropertyField(m_FadeInDistance, EditorGUIUtility.TrTextContent("Fade In Distance", "Sets the distance over which HDRP fades Contact Shadows in when past the Min Distance. Uses meters."));
+                PropertyField(m_FadeDistance, EditorGUIUtility.TrTextContent("Fade Out Distance", "Sets the distance over which HDRP fades Contact Shadows out when at the Max Distance. Uses meters."));
+                PropertyField(m_Opacity, EditorGUIUtility.TrTextContent("Opacity", "Controls the opacity of the Contact Shadow."));
+                base.OnInspectorGUI();
+                GUI.enabled = useCustomValue;
+                PropertyField(m_SampleCount, EditorGUIUtility.TrTextContent("Sample Count", "Controls the number of samples HDRP uses for ray casting."));
+                GUI.enabled = true;
             }
         }
     }

com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeMasterNode.cs

@@ -783,6 +783,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }

com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricMasterNode.cs

@@ -794,6 +794,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);
 
             base.CollectShaderProperties(collector, generationMode);
         }

com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairMasterNode.cs

@@ -899,6 +899,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }

com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitGUI.cs

@@ -14,8 +14,7 @@ class HDLitGUI : HDShaderGUI
         // For surface option shader graph we only want all unlit features but alpha clip and back then front rendering
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
-            ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {

com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitMasterNode.cs

@@ -1119,6 +1119,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }

com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitMasterNode.cs

@@ -1424,6 +1424,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);
 
             base.CollectShaderProperties(collector, generationMode);
         }

com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs

@@ -26,6 +26,7 @@ public enum Features
             ReceiveSSR                  = 1 << 8,
             ShowAfterPostProcessPass    = 1 << 9,
             Unlit                       = Surface | BlendMode | DoubleSided | DoubleSidedNormalMode | AlphaCutoff | AlphaCutoffShadowThreshold | AlphaCutoffThreshold | BackThenFrontRendering | ShowAfterPostProcessPass,
+            ShowPrePassAndPostPass      = 1 << 11,
             Lit                         = All,
             All                         = ~0,
         }
@@ -483,11 +484,14 @@ void DrawSurfaceGUI()
                 if (transparentBackfaceEnable != null)
                     materialEditor.ShaderProperty(transparentBackfaceEnable, Styles.transparentBackfaceEnableText);
 
-                if (transparentDepthPrepassEnable != null)
-                    materialEditor.ShaderProperty(transparentDepthPrepassEnable, Styles.transparentDepthPrepassEnableText);
+                if ((m_Features & Features.ShowPrePassAndPostPass) != 0)
+                {
+                    if (transparentDepthPrepassEnable != null)
+                        materialEditor.ShaderProperty(transparentDepthPrepassEnable, Styles.transparentDepthPrepassEnableText);
 
-                if (transparentDepthPostpassEnable != null)
-                    materialEditor.ShaderProperty(transparentDepthPostpassEnable, Styles.transparentDepthPostpassEnableText);
+                    if (transparentDepthPostpassEnable != null)
+                        materialEditor.ShaderProperty(transparentDepthPostpassEnable, Styles.transparentDepthPostpassEnableText);
+                }
 
                 if (transparentWritingMotionVec != null)
                     materialEditor.ShaderProperty(transparentWritingMotionVec, Styles.transparentWritingMotionVecText);