Unity-Technologies
diff --git a/‎TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/801_SubSurfaceScatteringDeferred.png‎
Lines changed: 2 additions & 2 deletions b/‎TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/801_SubSurfaceScatteringDeferred.png‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/802_SubSurfaceScatteringForward.png‎
Lines changed: 2 additions & 2 deletions b/‎TestProjects/HDRP_DXR_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/802_SubSurfaceScatteringForward.png‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs‎
Lines changed: 10 additions & 5 deletions b/‎com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs‎
Lines changed: 13 additions & 3 deletions b/‎com.unity.render-pipelines.core/Editor/Volume/VolumeProfileFactory.cs‎
Lines changed: 13 additions & 3 deletions
diff --git a/‎com.unity.render-pipelines.core/Runtime/Volume/VolumeProfile.cs‎
Lines changed: 18 additions & 0 deletions b/‎com.unity.render-pipelines.core/Runtime/Volume/VolumeProfile.cs‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎com.unity.render-pipelines.high-definition/CHANGELOG.md‎
Lines changed: 8 additions & 0 deletions b/‎com.unity.render-pipelines.high-definition/CHANGELOG.md‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs‎
Lines changed: 11 additions & 3 deletions b/‎com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs‎
Lines changed: 11 additions & 3 deletions
diff --git a/‎com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedScalableSetting.cs‎
Lines changed: 43 additions & 17 deletions b/‎com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedScalableSetting.cs‎
Lines changed: 43 additions & 17 deletions
diff --git a/‎com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs‎
Lines changed: 5 additions & 4 deletions b/‎com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl‎
Lines changed: 7 additions & 5 deletions b/‎com.unity.render-pipelines.high-definition/Runtime/Material/BuiltinUtilities.hlsl‎
Lines changed: 7 additions & 5 deletions
@@ -16,24 +16,24 @@ namespace UnityEditor.Rendering
     /// in the inspector:
     /// <code>
     /// using UnityEngine.Rendering;
-    /// 
+    ///
     /// [CustomEditor(typeof(VolumeProfile))]
     /// public class CustomVolumeProfileEditor : Editor
     /// {
     ///     VolumeComponentListEditor m_ComponentList;
-    /// 
+    ///
     ///     void OnEnable()
     ///     {
     ///         m_ComponentList = new VolumeComponentListEditor(this);
     ///         m_ComponentList.Init(target as VolumeProfile, serializedObject);
     ///     }
-    /// 
+    ///
     ///     void OnDisable()
     ///     {
     ///         if (m_ComponentList != null)
     ///             m_ComponentList.Clear();
     ///     }
-    /// 
+    ///
     ///     public override void OnInspectorGUI()
     ///     {
     ///         serializedObject.Update();
@@ -58,6 +58,8 @@ public sealed class VolumeComponentListEditor
         Dictionary<Type, Type> m_EditorTypes; // Component type => Editor type
         List<VolumeComponentEditor> m_Editors;
 
+        int m_CurrentHashCode;
+
         /// <summary>
         /// Creates a new instance of <see cref="VolumeComponentListEditor"/> to use in an
         /// existing editor.
@@ -195,9 +197,12 @@ public void OnGUI()
             if (asset == null)
                 return;
 
-            if (asset.isDirty)
+            // 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)
             {
                 RefreshEditors();
+                m_CurrentHashCode = asset.GetHashCode();
                 asset.isDirty = false;
             }
 
 
@@ -56,12 +56,22 @@ public static VolumeProfile CreateVolumeProfile(Scene scene, string targetName)
             {
                 var scenePath = Path.GetDirectoryName(scene.path);
                 var extPath = scene.name;
-                var profilePath = scenePath + "/" + extPath;
+                var profilePath = scenePath + Path.DirectorySeparatorChar + extPath;
 
                 if (!AssetDatabase.IsValidFolder(profilePath))
-                    AssetDatabase.CreateFolder(scenePath, extPath);
+                {
+                    var directories = profilePath.Split(Path.DirectorySeparatorChar);
+                    string rootPath = "";
+                    foreach (var directory in directories)
+                    {
+                        var newPath = rootPath + directory;
+                        if (!AssetDatabase.IsValidFolder(newPath))
+                            AssetDatabase.CreateFolder(rootPath.TrimEnd(Path.DirectorySeparatorChar), directory);
+                        rootPath = newPath + Path.DirectorySeparatorChar;
+                    }
+                }  
 
-                path = profilePath + "/";
+                path = profilePath + Path.DirectorySeparatorChar;
             }
 
             path += targetName + " Profile.asset";
 
@@ -279,5 +279,23 @@ public bool TryGetAllSubclassOf<T>(Type type, List<T> result)
 
             return count != result.Count;
         }
+
+
+        /// <summary>
+        /// A custom hashing function that Unity uses to compare the state of parameters.
+        /// </summary>
+        /// <returns>A computed hash code for the current instance.</returns>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hash = 17;
+
+                for (int i = 0; i < components.Count; i++)
+                    hash = hash * 23 + components[i].GetHashCode();
+
+                return hash;
+            }
+        }
     }
 }
@@ -507,6 +507,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed drag area width at left of Light's intensity field in Inspector.
 - Fixed light type resolution when performing a reset on HDAdditionalLightData (case 1220931)
 - Fixed reliance on atan2 undefined behavior in motion vector debug shader.
+- Fixed an usage of a a compute buffer not bound (1229964)
+- Fixed an issue where changing the default volume profile from another inspector would not update the default volume editor.
+- Fix issues in the post process system with RenderTexture being invalid in some cases, causing rendering problems.
+- Fixed an issue where unncessarily serialized members in StaticLightingSky component would change each time the scene is changed.
+- Fixed a weird behavior in the scalable settings drawing when the space becomes tiny (1212045).
+- Fixed a regression in the ray traced indirect diffuse due to the new probe system.
+- Fix for range compression factor for probes going negative (now clamped to positive values).
+- Fixed path validation when creating new volume profile (case 1229933)
 
 ### Changed
 - Color buffer pyramid is not allocated anymore if neither refraction nor distortion are enabled
 
@@ -45,6 +45,7 @@ public class Styles
             ReorderableList m_BeforeTransparentCustomPostProcesses;
             ReorderableList m_BeforePostProcessCustomPostProcesses;
             ReorderableList m_AfterPostProcessCustomPostProcesses;
+            int m_CurrentVolumeProfileHash;
 
             public void OnGUI(string searchContext)
             {
@@ -207,6 +208,13 @@ void Draw_VolumeInspector()
                 }
                 EditorGUILayout.EndHorizontal();
 
+                // The state of the profile can change without the asset reference changing so in this case we need to reset the editor.
+                if (m_CurrentVolumeProfileHash != asset.GetHashCode() && m_CachedDefaultVolumeProfileEditor != null)
+                {
+                    m_CurrentVolumeProfileHash = asset.GetHashCode();
+                    m_CachedDefaultVolumeProfileEditor = null;
+                }
+
                 Editor.CreateCachedEditor(asset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedDefaultVolumeProfileEditor);
                 EditorGUIUtility.labelWidth -= 18;
                 bool oldEnabled = GUI.enabled;
@@ -230,13 +238,13 @@ void Draw_VolumeInspector()
                     hdrpAsset.defaultLookDevProfile = newLookDevAsset;
                     EditorUtility.SetDirty(hdrpAsset);
                 }
-                
+
                 if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18)))
                 {
                     DefaultVolumeProfileCreator.CreateAndAssign(DefaultVolumeProfileCreator.Kind.LookDev);
                 }
                 EditorGUILayout.EndHorizontal();
-                
+
                 Editor.CreateCachedEditor(lookDevAsset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedLookDevVolumeProfileEditor);
                 EditorGUIUtility.labelWidth -= 18;
                 oldEnabled = GUI.enabled;
@@ -311,7 +319,7 @@ static string GetDefaultName(Kind kind)
             }
             return defaultName;
         }
-        
+
         public static void CreateAndAssign(Kind kind)
         {
             var assetCreator = ScriptableObject.CreateInstance<DefaultVolumeProfileCreator>();
 
@@ -136,29 +136,55 @@ ScalableSettingSchema schema
         static void MultiField<T>(Rect position, GUIContent[] subLabels, T[] values)
             where T: struct
         {
+            // The number of slots we need to fit into this rectangle
             var length = values.Length;
-            var num = (position.width - (float) (length - 1) * 3f) / (float) length;
-            var position1 = new Rect(position)
-            {
-                width = num
-            };
-            var labelWidth = EditorGUIUtility.labelWidth;
+
+            // Let's compute the space allocated for every field including the label
+            var num = position.width / (float) length;
+
+            // Reset the indentation
             var indentLevel = EditorGUI.indentLevel;
             EditorGUI.indentLevel = 0;
+
+            // Variable to keep track of the current pixel shift in the rectangle we were assigned for this whole section.
+            float pixelShift = 0;
+
+            // Loop through the levels
             for (var index = 0; index < values.Length; ++index)
             {
-                EditorGUIUtility.labelWidth = CalcPrefixLabelWidth(subLabels[index], (GUIStyle) null);
-                if (typeof(T) == typeof(int))
-                    values[index] = (T)(object)EditorGUI.DelayedIntField(position1, subLabels[index], (int)(object)values[index]);
-                else if (typeof(T) == typeof(bool))
-                    values[index] = (T)(object)EditorGUI.Toggle(position1, subLabels[index], (bool)(object)values[index]);
-                else if (typeof(T) == typeof(float))
-                    values[index] = (T)(object)EditorGUI.FloatField(position1, subLabels[index], (float)(object)values[index]);
-                else
-                    throw new ArgumentOutOfRangeException($"<{typeof(T)}> is not a supported type for multi field");
-                position1.x += num + 4f;
+                // Let's first compute what is the width of the label of this scalable setting level
+				// We make sure that the label doesn't go beyond the space available for this scalable setting level
+                var labelWidth = Mathf.Clamp(CalcPrefixLabelWidth(subLabels[index], (GUIStyle)null), 0, num);
+
+                // Draw the Label at the expected position
+                EditorGUI.LabelField(new Rect(position.x + pixelShift, position.y, labelWidth, position.height), subLabels[index]);
+
+                // We need to remove from the position the label size that we've just drawn and shift by it's length
+                pixelShift += labelWidth;
+
+                // The amount of space left for the field
+                float spaceLeft = num - labelWidth;
+
+                // If at least two pixels are left to draw this field, draw it, otherwise, skip
+                if (spaceLeft > 2)
+                {
+                    // Define the rectangle for the field
+                    var fieldSlot = new Rect(position.x + pixelShift, position.y, num - labelWidth, position.height);
+
+                    // Draw the right field depending on its type.
+                    if (typeof(T) == typeof(int))
+                        values[index] = (T)(object)EditorGUI.DelayedIntField(fieldSlot, (int)(object)values[index]);
+                    else if (typeof(T) == typeof(bool))
+                        values[index] = (T)(object)EditorGUI.Toggle(fieldSlot, (bool)(object)values[index]);
+                    else if (typeof(T) == typeof(float))
+                        values[index] = (T)(object)EditorGUI.FloatField(fieldSlot, (float)(object)values[index]);
+                    else
+                        throw new ArgumentOutOfRangeException($"<{typeof(T)}> is not a supported type for multi field");
+                }
+
+                // Shift by the slot that was left for the field
+                pixelShift += spaceLeft;
             }
-            EditorGUIUtility.labelWidth = labelWidth;
             EditorGUI.indentLevel = indentLevel;
         }
 
 
@@ -1264,7 +1264,7 @@ internal void GetDirectionalLightData(CommandBuffer cmd, HDCamera hdCamera, Visi
 
             lightData.shadowDimmer           = additionalLightData.shadowDimmer;
             lightData.volumetricShadowDimmer = additionalLightData.volumetricShadowDimmer;
-            GetContactShadowMask(additionalLightData, HDAdditionalLightData.ScalableSettings.UseContactShadow(m_Asset), hdCamera, true, ref lightData.contactShadowMask,ref lightData.isRayTracedContactShadow);
+            GetContactShadowMask(additionalLightData, HDAdditionalLightData.ScalableSettings.UseContactShadow(m_Asset), hdCamera, isRasterization: true, ref lightData.contactShadowMask,ref lightData.isRayTracedContactShadow);
 
             // We want to have a colored penumbra if the flag is on and the color is not gray
             bool penumbraTint = additionalLightData.penumbraTint && ((additionalLightData.shadowTint.r != additionalLightData.shadowTint.g) || (additionalLightData.shadowTint.g != additionalLightData.shadowTint.b));
@@ -1365,7 +1365,7 @@ bool EnoughScreenSpaceShadowSlots(GPULightType gpuLightType, int screenSpaceChan
         }
 
         internal void GetLightData(CommandBuffer cmd, HDCamera hdCamera, HDShadowSettings shadowSettings, VisibleLight light, Light lightComponent,
-            ProcessedLightData processedData, int shadowIndex,  BoolScalableSetting contactShadowsScalableSetting, bool isRasterization, ref Vector3 lightDimensions, ref int screenSpaceShadowIndex, ref int screenSpaceChannelSlot, ref LightData lightData)
+            in ProcessedLightData processedData, int shadowIndex,  BoolScalableSetting contactShadowsScalableSetting, bool isRasterization, ref Vector3 lightDimensions, ref int screenSpaceShadowIndex, ref int screenSpaceChannelSlot, ref LightData lightData)
         {
             var additionalLightData = processedData.additionalLightData;
             var gpuLightType = processedData.gpuLightType;
@@ -2370,7 +2370,7 @@ void PrepareGPULightdata(CommandBuffer cmd, HDCamera hdCamera, CullingResults cu
                     LightData lightData = new LightData();
 
                     // Punctual, area, projector lights - the rendering side.
-                    GetLightData(cmd, hdCamera, hdShadowSettings, light, lightComponent, m_ProcessedLightData[lightIndex], shadowIndex, contactShadowScalableSetting, isRasterization: true, ref lightDimensions, ref m_ScreenSpaceShadowIndex, ref m_ScreenSpaceShadowChannelSlot, ref lightData);
+                    GetLightData(cmd, hdCamera, hdShadowSettings, light, lightComponent, in m_ProcessedLightData[lightIndex], shadowIndex, contactShadowScalableSetting, isRasterization: true, ref lightDimensions, ref m_ScreenSpaceShadowIndex, ref m_ScreenSpaceShadowChannelSlot, ref lightData);
 
                     // Add the previously created light data
                     m_lightList.lights.Add(lightData);
@@ -2938,7 +2938,8 @@ static void ClearLightLists(    in BuildGPULightListParameters parameters,
                 // Note we clear the whole content and not just the header since it is fast enough, happens only in one frame and is a bit more robust
                 // to changes to the inner workings of the lists.
                 // Also, we clear all the lists and to be resilient to changes in pipeline.
-                ClearLightList(parameters, cmd, resources.tileAndClusterData.bigTileLightList);
+                if (parameters.runBigTilePrepass)
+                    ClearLightList(parameters, cmd, resources.tileAndClusterData.bigTileLightList);
                 ClearLightList(parameters, cmd, resources.tileAndClusterData.lightList);
                 ClearLightList(parameters, cmd, resources.tileAndClusterData.perVoxelOffset);
 
 
@@ -38,6 +38,9 @@ void InitBuiltinData(PositionInputs posInput, float alpha, float3 normalWS, floa
 
     builtinData.opacity = alpha;
 
+    // Use uniform directly - The float need to be cast to uint (as unity don't support to set a uint as uniform)
+    builtinData.renderingLayers = _EnableLightLayers ? asuint(unity_RenderingLayer.x) : DEFAULT_LIGHT_LAYERS;
+    
     // We only want to read the screen space buffer that holds the indirect diffuse signal if this is not a transparent surface
 #if RAYTRACING_ENABLED && (SHADERPASS == SHADERPASS_GBUFFER || SHADERPASS == SHADERPASS_FORWARD) && !defined(_SURFACE_TYPE_TRANSPARENT)
     if (_RaytracedIndirectDiffuse == 1)
@@ -54,12 +57,11 @@ void InitBuiltinData(PositionInputs posInput, float alpha, float3 normalWS, floa
     }
     else
 #endif
+    {
+        // Sample lightmap/probevolume/lightprobe/volume proxy
+        builtinData.bakeDiffuseLighting = SampleBakedGI(posInput, normalWS, builtinData.renderingLayers, texCoord1.xy, texCoord2.xy);
+    }
 
-    // Use uniform directly - The float need to be cast to uint (as unity don't support to set a uint as uniform)
-    builtinData.renderingLayers = _EnableLightLayers ? asuint(unity_RenderingLayer.x) : DEFAULT_LIGHT_LAYERS;
-
-    // Sample lightmap/probevolume/lightprobe/volume proxy
-    builtinData.bakeDiffuseLighting = SampleBakedGI(posInput, normalWS, builtinData.renderingLayers, texCoord1.xy, texCoord2.xy);
     // We also sample the back lighting in case we have transmission. If not use this will be optimize out by the compiler
     // For now simply recall the function with inverted normal, the compiler should be able to optimize the lightmap case to not resample the directional lightmap
     // however it may not optimize the lightprobe case due to the proxy volume relying on dynamic if (to verify), not a problem for SH9, but a problem for proxy volume.
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public class Styles`
`45`	`45`	`ReorderableList m_BeforeTransparentCustomPostProcesses;`
`46`	`46`	`ReorderableList m_BeforePostProcessCustomPostProcesses;`
`47`	`47`	`ReorderableList m_AfterPostProcessCustomPostProcesses;`
	`48`	`+ int m_CurrentVolumeProfileHash;`
`48`	`49`
`49`	`50`	`public void OnGUI(string searchContext)`
`50`	`51`	`{`
`@@ -207,6 +208,13 @@ void Draw_VolumeInspector()`
`207`	`208`	`}`
`208`	`209`	`EditorGUILayout.EndHorizontal();`
`209`	`210`
	`211`	`+ // The state of the profile can change without the asset reference changing so in this case we need to reset the editor.`
	`212`	`+ if (m_CurrentVolumeProfileHash != asset.GetHashCode() && m_CachedDefaultVolumeProfileEditor != null)`
	`213`	`+ {`
	`214`	`+ m_CurrentVolumeProfileHash = asset.GetHashCode();`
	`215`	`+ m_CachedDefaultVolumeProfileEditor = null;`
	`216`	`+ }`
	`217`	`+`
`210`	`218`	`Editor.CreateCachedEditor(asset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedDefaultVolumeProfileEditor);`
`211`	`219`	`EditorGUIUtility.labelWidth -= 18;`
`212`	`220`	`bool oldEnabled = GUI.enabled;`
`@@ -230,13 +238,13 @@ void Draw_VolumeInspector()`
`230`	`238`	`hdrpAsset.defaultLookDevProfile = newLookDevAsset;`
`231`	`239`	`EditorUtility.SetDirty(hdrpAsset);`
`232`	`240`	`}`
`233`		`-`
	`241`	`+`
`234`	`242`	`if (GUILayout.Button(EditorGUIUtility.TrTextContent("New", "Create a new Volume Profile for default in your default resource folder (defined in Wizard)"), GUILayout.Width(38), GUILayout.Height(18)))`
`235`	`243`	`{`
`236`	`244`	`DefaultVolumeProfileCreator.CreateAndAssign(DefaultVolumeProfileCreator.Kind.LookDev);`
`237`	`245`	`}`
`238`	`246`	`EditorGUILayout.EndHorizontal();`
`239`		`-`
	`247`	`+`
`240`	`248`	`Editor.CreateCachedEditor(lookDevAsset, Type.GetType("UnityEditor.Rendering.VolumeProfileEditor"), ref m_CachedLookDevVolumeProfileEditor);`
`241`	`249`	`EditorGUIUtility.labelWidth -= 18;`
`242`	`250`	`oldEnabled = GUI.enabled;`
`@@ -311,7 +319,7 @@ static string GetDefaultName(Kind kind)`
`311`	`319`	`}`
`312`	`320`	`return defaultName;`
`313`	`321`	`}`
`314`		`-`
	`322`	`+`
`315`	`323`	`public static void CreateAndAssign(Kind kind)`
`316`	`324`	`{`
`317`	`325`	`var assetCreator = ScriptableObject.CreateInstance<DefaultVolumeProfileCreator>();`