[7.x.x] Merge hd/staging [Skip CI]

com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.cs

@@ -42,7 +42,7 @@ public interface IViewDisplayer
         /// <summary>Callback on update requested</summary>
         event Action OnUpdateRequested;
     }
-    
+
     partial class DisplayWindow : EditorWindow, IViewDisplayer
     {
         static partial class Style
@@ -82,7 +82,7 @@ internal static readonly (Texture2D icon, string tooltip) k_LayoutStackIcon =
             internal const string k_CameraMenuSync1On2 = "Align Camera 1 with Camera 2";
             internal const string k_CameraMenuSync2On1 = "Align Camera 2 with Camera 1";
             internal const string k_CameraMenuReset = "Reset Cameras";
-            
+
             internal const string k_EnvironmentSidePanelName = "Environment";
             internal const string k_DebugSidePanelName = "Debug";
 
@@ -127,7 +127,7 @@ internal static readonly (Texture2D icon, string tooltip) k_LayoutStackIcon =
         Label m_NoEnvironment2;
 
         Image[] m_Views = new Image[2];
-        
+
         LayoutContext layout
             => LookDev.currentContext.layout;
 
@@ -143,7 +143,7 @@ Layout viewLayout
                 }
             }
         }
-        
+
         SidePanel sidePanel
         {
             get => layout.showedSidePanel;
@@ -218,7 +218,7 @@ event Action IViewDisplayer.OnUpdateRequested
 
         void OnEnable()
         {
-            //Stylesheet             
+            //Stylesheet
             // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
             // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
             // Waiting for filter on stylesheet (case 1228706) to remove last error.
@@ -486,7 +486,7 @@ Rect IViewDisplayer.GetRect(ViewCompositionIndex index)
                     throw new ArgumentException("Unknown ViewCompositionIndex: " + index);
             }
         }
-        
+
         Vector2 m_LastFirstViewSize = new Vector2();
         Vector2 m_LastSecondViewSize = new Vector2();
         void IViewDisplayer.SetTexture(ViewCompositionIndex index, Texture texture)
@@ -532,7 +532,7 @@ void IViewDisplayer.SetTexture(ViewCompositionIndex index, Texture texture)
                     throw new ArgumentException("Unknown ViewCompositionIndex: " + index);
             }
         }
-        
+
         void IViewDisplayer.Repaint() => Repaint();
 
         void ApplyLayout(Layout value)
@@ -627,19 +627,21 @@ IStyle GetEnvironmentContenairDraggerStyle()
 
         void OnGUI()
         {
-            //Stylesheet             
+            //Stylesheet
             // [case 1219692] if LookDev is open while reimporting CoreRP package,
             // stylesheet can be null. In this case, we can have a null stylesheet
-            // registered as it got destroyed. Reloading it. As we cannot just 
+            // registered as it got destroyed. Reloading it. As we cannot just
             // remove a null entry, we must filter and reconstruct the while list.
             if (styleSheet == null || styleSheet.Equals(null)
                 || (!EditorGUIUtility.isProSkin && (styleSheetLight == null || styleSheetLight.Equals(null))))
             {
                 // While (case 1228706) is still on going, we sill close and reopen the look dev.
                 // This will prevent spawning error at frame.
-                LookDev.Close();
-                LookDev.Open();
-                return;
+                // Note 2: This actually causes the lookdev to break completely with light theme.
+                // Until the actual issue is fixed, we'll comment this fix out as it only concerns an upgrade problem.
+                //LookDev.Close();
+                //LookDev.Open();
+                //return;
 
                 // Following lines is the correct fix if UIElement filter garbage collected Stylesheet.
 
@@ -689,7 +691,7 @@ void OnGUI()
             }
 
             // [case 1245086] Guard in case the SRP asset is set to null (or to a not supported SRP) when the lookdev window is already open
-            // Note: After an editor reload, we might get a null OnUpdateRequestedInternal and null SRP for a couple of frames, hence the check. 
+            // Note: After an editor reload, we might get a null OnUpdateRequestedInternal and null SRP for a couple of frames, hence the check.
             if (!LookDev.supported && OnUpdateRequestedInternal !=null)
             {
                 // Print an error and close the Lookdev window (to avoid spamming the console)

com.unity.render-pipelines.core/Editor/LookDev/LookDevRenderer.cs

@@ -30,7 +30,6 @@ public void Dispose()
                 return;
             disposed = true;
 
-            stage?.Dispose();
             stage = null;
             updater = null;
             output?.Release();

com.unity.render-pipelines.core/Editor/LookDev/Stage.cs

@@ -196,7 +196,7 @@ static void InitAddedObjectsRecursively(GameObject go)
             var lineRenderer = go.GetComponent<LineRenderer>();
             if (lineRenderer != null)
                 lineRenderer.lightProbeUsage = UnityEngine.Rendering.LightProbeUsage.Off;
-            
+
             var volumes = go.GetComponents<UnityEngine.Rendering.Volume>();
             foreach (var volume in volumes)
                 volume.UpdateLayer(); //force update of layer now as the Update can be called after we unregister volume from manager
@@ -273,6 +273,7 @@ class StageCache : IDisposable
 
         Stage[] m_Stages;
         Context m_Contexts;
+        IDataProvider m_CurrentDataProvider;
 
         public Stage this[ViewIndex index]
             => m_Stages[(int)index];
@@ -310,6 +311,8 @@ Stage InitStage(ViewIndex index, IDataProvider dataProvider)
             }
 
             dataProvider.FirstInitScene(stage.runtimeInterface);
+
+            m_CurrentDataProvider = dataProvider;
             return stage;
         }
 
@@ -345,7 +348,10 @@ void CleanUp()
             if (!disposedValue)
             {
                 foreach (Stage stage in m_Stages)
+                {
+                    m_CurrentDataProvider.Cleanup(stage.runtimeInterface);
                     stage.Dispose();
+                }
 
                 disposedValue = true;
             }

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

@@ -199,10 +199,10 @@ public void OnGUI()
 
             // Even if the asset is not dirty, the list of component may have been changed by another inspector.
             // In this case, only the hash will tell us that we need to refresh.
-            if (asset.isDirty || asset.GetHashCode() != m_CurrentHashCode)
+            if (asset.isDirty || asset.GetComponentListHashCode() != m_CurrentHashCode)
             {
                 RefreshEditors();
-                m_CurrentHashCode = asset.GetHashCode();
+                m_CurrentHashCode = asset.GetComponentListHashCode();
                 asset.isDirty = false;
             }
 

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

@@ -59,7 +59,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/LookDev/IDataProvider.cs

@@ -46,6 +46,12 @@ public interface IDataProvider
         /// </summary>
         /// <param name="stage">Access element of the LookDev's scene</param>
         void OnEndRendering(StageRuntimeInterface stage);
+
+        /// <summary>
+        /// Callback called to do any necessary cleanup.
+        /// </summary>
+        /// <param name="SRI">Access element of the LookDev's scene</param>
+        void Cleanup(StageRuntimeInterface SRI);
     }
 
     /// <summary>

com.unity.render-pipelines.core/Runtime/Volume/VolumeProfile.cs

@@ -297,5 +297,18 @@ public override int GetHashCode()
                 return hash;
             }
         }
+
+        internal int GetComponentListHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+
+                for (int i = 0; i < components.Count; i++)
+                    hash = hash * 23 + components[i].GetType().GetHashCode();
+
+                return hash;
+            }
+        }
     }
 }

com.unity.render-pipelines.core/ShaderLibrary/Shadow/ShadowSamplingTent.hlsl

@@ -1,3 +1,5 @@
+#ifndef SHADOW_SAMPLING_TENT_INCLUDED
+#define SHADOW_SAMPLING_TENT_INCLUDED
 // ------------------------------------------------------------------
 //  PCF Filtering Tent Functions
 // ------------------------------------------------------------------
@@ -242,3 +244,4 @@ void SampleShadow_ComputeSamples_Tent_7x7(real4 shadowMapTexture_TexelSize, real
     fetchesWeights[14] = fetchesWeightsU.z * fetchesWeightsV.w;
     fetchesWeights[15] = fetchesWeightsU.w * fetchesWeightsV.w;
 }
+#endif

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

@@ -1,4 +1,4 @@
-# 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/)
@@ -8,6 +8,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Fixed
 - Fixed a bug where connections to the `Normal` slot on *Stack Lit Master* node would be lost when changing normal space. 
+- Fixed an issue where manipulating the color wheels in a volume component would reset the cursor every time.
+- Fixed an issue where static sky lighting would not be updated for a new scene until it's reloaded at least once.
+- Fixed missing include guards in shadow hlsl files.
+- Fixed issue with light layers bigger than 8 (and above the supported range).
+- Fixed issues with scene view and transparent motion vectors.
+- Fix reflection probe frame settings override
+- Workaround an issue caused by GetKernelThreadGroupSizes  failing to retrieve correct group size. 
+- Fixed transparent motion vector framesetting not sanitized.
+- Fix issue causing blocky artifacts when decals affect metallic and are applied on material with specular color workflow.
+- Fixed wrong order of post process frame settings.
+- Fixed warning in HDAdditionalLightData OnValidate (cases 1250864, 1244578)
+- Fixed issue with blue line in prefabs for volume mode.
+- Fix issue that caused sky to incorrectly render when using a custom projection matrix.
+- Fixed issue with completely black AO on double sided materials when normal mode is set to None.
+- Fixed issue with culling layer mask of area light's emissive mesh 
+- Fixed for area light not updating baked light result when modifying with gizmo.
+- Fixed errors when switching area light to disk shape while an area emissive mesh was displayed.
+- PBR Sky now doesn't go black when going below sea level, but it instead freezes calculation as if on the horizon.
+- Fixed XR single-pass macros in tessellation shaders.
+- Fixed XR Display providers not getting zNear and zFar plane distances passed to them when in HDRP.
+- Fixed issue with white flash when enabling SSR.
+- Fixed issue with depth pyramid generation and dynamic resolution.
+- Fixed an issue where opening the look dev window with the light theme would make the window blink and eventually crash unity.
+- Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change.
+- Fixed an issue where look dev lighting would go black when a new scene is loaded.
+
+### Changed
+- Changed extensions of shader CAS include files.
 
 ## [7.4.1] - 2020-06-03
 

com.unity.render-pipelines.high-definition/Documentation~/Diffusion-Profile.md

@@ -1,8 +1,13 @@
 # Diffusion Profile
 
-The High Definition Render Pipeline (HDRP) stores most [subsurface scattering](Subsurface-Scattering.html) settings in a __Diffusion Profile__ Asset. You can assign a __Diffusion Profile__ Asset directly to Materials that use Subsurface Scattering.
+The High Definition Render Pipeline (HDRP) stores most [subsurface scattering](Subsurface-Scattering.md) settings in a __Diffusion Profile__ Asset. You can assign a __Diffusion Profile__ Asset directly to Materials that use Subsurface Scattering.
 
-To create a Diffusion Profile, navigate to __Assets > Create > Rendering > Diffusion Profile__. To use it, open your HDRP Asset and add it to the __Diffusion Profile List__ property.
+To create a Diffusion Profile, navigate to __Assets > Create > Rendering > Diffusion Profile__.
+
+* To use it by default, open your HDRP Asset and, in the **Material** section, add it to the __Diffusion Profile List__.
+* To use it in a particular [Volume](Volumes.md), select a Volume with a [Diffusion Profile Override](Override-Diffusion-Profile.md) and add it to the **Diffusion Profile List** .
+
+## Properties
 
 | Property| Description |
 |:---|:---|
@@ -14,15 +19,15 @@ To create a Diffusion Profile, navigate to __Assets > Create > Rendering > Diffu
 
 
 
-## Subsurface Scattering only
+### Subsurface Scattering only
 
 | Property| Description |
 |:---|:---|
 | **Texturing Mode** | Use the drop-down to select when HDRP applies the albedo of the Material.<br />&#8226; **Post-Scatter**: HDRP applies the albedo to the Material after the subsurface scattering pass pass. This means that the contents of the albedo texture are not blurred. Use this mode for scanned data and photographs that already contain some blur due to subsurface scattering. <br />&#8226; **Pre- and Post-Scatter**: Albedo is partially applied twice, before and after the subsurface scattering pass pass. Effectively, this blurs the albedo, resulting in a softer, more natural look. |
 
 
 
-## Transmission only
+### Transmission only
 
 | Property| Description |
 |:---|:---|
@@ -33,7 +38,7 @@ To create a Diffusion Profile, navigate to __Assets > Create > Rendering > Diffu
 
 
 
-## Profile Previews
+### Profile Previews
 
 | Property| Description |
 |:---|:---|

com.unity.render-pipelines.high-definition/Documentation~/Dynamic-Resolution.md

@@ -1,16 +1,21 @@
 # Dynamic resolution
 
-Dynamic resolution reduces the workload on the GPU, which helps maintain a stable target frame rate. The High Definition Render Pipeline (HDRP) uses dynamic resolution to lower the resolution of the render targets that the main rendering passes use. HDRP will use hardware dynamic resolution when supported by the platform, otherwise it will use a software version.
+Dynamic resolution reduces the workload on the GPU, which helps maintain a stable target frame rate. The High Definition Render Pipeline (HDRP) uses dynamic resolution to lower the resolution of the render targets that the main rendering passes use. To do this, HDRP uses hardware dynamic resolution, if the platform supports it, otherwise it uses a software version. The main difference is that, for hardware dynamic resolution, the hardware treats the render targets up until the back buffer as being of the scaled size. This means that is is faster to clear the render targets.
 
 To use dynamic resolution in your Project, you must enable dynamic resolution in your [HDRP Asset)(HDRP-Asset.html). In the Inspector for your HDRP Asset, navigate to **Rendering** **> Dynamic Resolution** and enable the **Enable** checkbox. For information on how to customize the rest of the HDRP Asset’s global dynamic resolution properties, see the dynamic resolution section of the [HDRP Asset documentation](HDRP-Asset.html#DynamicResolution).
 Moreover, each camera that needs to perform dynamic resolution needs to have the checkbox **General > Allow Dynamic Resolution** set on the camera component.
 
-When you enable dynamic resolution, HDRP allocates render targets to accommodate the maximum resolution possible. Then, HDRP rescales the viewport accordingly, so it can render at varying resolutions. At the end of each frame, HDRP upscales the result of the scaled rendering to match the back buffer resolution. To do this, HDRP uses the method defined in the **Upscale Filter**. 
+When you enable dynamic resolution, HDRP allocates render targets to accommodate the maximum resolution possible. Then, HDRP rescales the viewport accordingly, so it can render at varying resolutions. At the end of each frame, HDRP upscales the result of the scaled rendering to match the back buffer resolution. Regardless of which method HDRP uses to process dynamic resolution, either hardware or software, it still uses a software method to upscale the result. The method HDRP uses is defined in the **Upscale Filter**. 
 
 ![](Images/DynamicResolution1.png)
 
 ## Using dynamic resolution
 
+To use dynamic resolution in your Project, you must enable dynamic resolution in your [HDRP Asset](HDRP-Asset.md) and then enable it for each [Camera](HDRP-Camera.md) you want to use it with. To do this:
+
+1. In the Inspector for your HDRP Asset, go to **Rendering** **> Dynamic Resolution** and enable the **Enable** checkbox. For information on how to customize the rest of the HDRP Asset’s global dynamic resolution properties, see the dynamic resolution section of the [HDRP Asset documentation](HDRP-Asset.md#DynamicResolution).
+2. For every [Camera](HDRP-Camera.md) you want to perform dynamic resolution, go to the **General** section and enable **Allow Dynamic Resolution**.
+
 Dynamic resolution is not automatic, so you need to manually call the `DynamicResolutionHandler.SetDynamicResScaler(PerformDynamicRes scaler, DynamicResScalePolicyType scalerType)` function. 
 
 The policy type can be one of the following: