Expose diffusion profile in ShaderGraph (#1869)

* Factorised the blackboard properties code

* Started to add diffusion profile material property drawer

* Experimenting with material property drawers

* Cleanup code and use SRP asset types instead of render pipeline types

* Cleanup

* Skip biquadratic reconstruction when doing filtering

* changelog

* Cleanup

* Use int instead of float (was doing experiment with multiple options)

* Added diffusion profile shader property drawer

* Mis missing docs

* Moving function to internal and adding doc for missing param in planar reflection function

* Cleanup code

* Halving the perf impact of film grain and sRGB dithering in Final pass (#1782)

* Optimize ALU of grain and dithering

* changelog

* Fix when res is smaller than grain texture

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* New DXR HDRP test for testing SNorm16 vertex format support in ray tracing shaders (#1651)

* Added new DXR test (6000_VertexFormats) for testing a few vertex attribute formats.

* Deleted unused material

* Perform the first mip of the depth pyramid alongside the downsample of depth buffer for low res transparents (#1800)

* Skip redundant mip0 of depth pyramid

* changelog

* Fix register on ps

* Reuse minDepth

* Make sure in rendergraph the copy of the depth buffer happens.

* Wrong naming

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix for text of shadow splits being truncated at the bottom (#1822)

* Add some more margin

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix property field drawing in custom pass volume (#1824)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Force probe to render again if first time was during async shader compilation (#1847)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Refresh environment library field in Lookdev (#1849)

* Refresh the library field too

* Add the refresh on Repaint

* Changelog

* Guard for null

* Revert "Add the refresh on Repaint"

This reverts commit 072c8e5.

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix matcap preferences serialization issue (#2013)

* Fix serialization issue

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Added a way to check the normals through the material views. (#1895)

* Added a way to check the normals through the material views.

* Adding the information in the documentation

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [10.x.x] AxF UI improvements (#1902)

* AxF UI - Remove possibility to select main BRDF as BTF since it is unsupported (could be handy to show it if it was imported as such, but for now we safely ignore since importer doesn't produce a material with that mode selected)
Also prevent compilation error even if selected.

* AxF UI - Add a bit of tooltips (even if for some fields engine editor bug doesn't show them), group advanced surface inputs into their own foldable UI block, make clearer the tiling/offset vector meaning.

* AxF UI - Remove UI parts that were moved into the main mapping section.

* AxF - Update the documentation to reflect UI changes.

* AxF new UI - Add missing file

* Close popup window when focus is lost (case 1258571) (#1907)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Default contact shadow LIGHT quality setting set to true on High (#1911)

* Have contact shadow on high quality.

* changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix double addition to sorted list (#1916)

* Added the possibility to replace or overwrite already existing local package when installing a new one. (#1921)

* When trying to install the local configuration package, if another one is already present the user is now asked whether they want to keep it or not.

* Update changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed an exception thrown when closing the lookdev because there is no active SRP anymore. (#1925)

* Fixed an exception thrown when closing the lookdev because there is no active SRP anymore.

* Update changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed UI alignment of framesettings (#1929)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed an issue where entering playmode would close the LookDev window. (#1937)

* Fixed an exception thrown when closing the lookdev because there is no active SRP anymore.

* Update changelog

* Fixed an issue where entering playmode would close the LookDev window.

* Update changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Added Simple mode to Earth Preset for PBR Sky (#1866)

* Added Simple Earth Mode to PBR Sky

* Update doc

* update doc

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix hair shader compilation issue with Debug Display mode (#2023)

* Fix compilation issue with debug mode and hair

* Update CHANGELOG.md

* Improve MSAA color resolve when very different samples are merged together (#1839)

* Improve MSAA color resolve.

* Changelog

* Revert unwanted changes

This reverts commit a55a905.

* Update refs

* Linux refs

* update linux and mac reference screenshots

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Revert "Fix hair shader compilation issue with Debug Display mode (#2023)"

This reverts commit 16989c6.

* Screen Space Ambient Occlusion for Shadow Matte (#1901)

* Added the export of normals during the prepass for shadow matte for proper SSAO calculation.

* change log

* update reference screenshots

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed Cutoff not working properly with ray tracing shaders default and SG (case 1261292). (#1923)

* Fixed Cutoff not working properly with ray tracing shaders default and SG (case 1261292).

* Update LitData.hlsl

* Update AxFData.hlsl

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix hair shader compilation issue with Debug Display mode (#2034)

* Fix compilation issue with debug mode and hair

* Update CHANGELOG.md

* Update Deferred.compute

* Update LightLoop.hlsl

* add missing meta

* Added BlackboardInputInfo attribute to order and rename shader inputs

* changed int priority to float

* Don't show shader input that don't have the BlackboardInputInfo attribute

Co-authored-by: FrancescoC-Unity <francescoc@unity3d.com>
Co-authored-by: Anis <anis@unity3d.com>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: IonutNedelcuUnity <43206223+IonutNedelcuUnity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: fredericv-unity3d <55485372+fredericv-unity3d@users.noreply.github.com>
Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>

Author: 9 people

com.unity.render-pipelines.high-definition/Editor/Material/DiffusionProfile/DiffusionProfileMaterialUI.cs

@@ -18,15 +18,15 @@ public static bool IsSupported(MaterialEditor materialEditor)
             });
         }
 
-        public static void OnGUI(MaterialEditor materialEditor, MaterialProperty diffusionProfileAsset, MaterialProperty diffusionProfileHash, int profileIndex)
+        public static void OnGUI(MaterialEditor materialEditor, MaterialProperty diffusionProfileAsset, MaterialProperty diffusionProfileHash, int profileIndex, string displayName = "Diffusion Profile")
         {
             // We can't cache these fields because of several edge cases like undo/redo or pressing escape in the object picker
             string guid = HDUtils.ConvertVector4ToGUID(diffusionProfileAsset.vectorValue);
             DiffusionProfileSettings diffusionProfile = AssetDatabase.LoadAssetAtPath<DiffusionProfileSettings>(AssetDatabase.GUIDToAssetPath(guid));
 
             // is it okay to do this every frame ?
             EditorGUI.BeginChangeCheck();
-            diffusionProfile = (DiffusionProfileSettings)EditorGUILayout.ObjectField("Diffusion Profile", diffusionProfile, typeof(DiffusionProfileSettings), false);
+            diffusionProfile = (DiffusionProfileSettings)EditorGUILayout.ObjectField(displayName, diffusionProfile, typeof(DiffusionProfileSettings), false);
             if (EditorGUI.EndChangeCheck())
             {
                 Vector4 newGuid = Vector4.zero;

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

@@ -0,0 +1,18 @@
+using UnityEngine;
+using UnityEditor;
+using System;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    public class DiffusionProfileDrawer : MaterialPropertyDrawer
+    {
+        public override float GetPropertyHeight(MaterialProperty prop, string label, MaterialEditor editor) => 0;
+
+        public override void OnGUI (Rect position, MaterialProperty prop, String label, MaterialEditor editor)
+        {
+            // Find properties
+            var assetProperty = MaterialEditor.GetMaterialProperty(editor.targets, prop.name + "_Asset");
+            DiffusionProfileMaterialUI.OnGUI(editor, assetProperty, prop, 0, prop.displayName);
+        }
+    }
+}

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/DiffusionProfileMaterialPropertyDrawer.cs.meta

@@ -0,0 +1,52 @@
+using System;
+using System.Reflection;
+using UnityEditor.ShaderGraph.Drawing;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+using UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers;
+using UnityEngine.Rendering.HighDefinition;
+using UnityEditor.ShaderGraph.Drawing.Inspector;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    [SGPropertyDrawer(typeof(DiffusionProfileSettings))]
+    class DiffusionProfilePropertyDrawer : IPropertyDrawer
+    {
+        internal delegate void ValueChangedCallback(DiffusionProfileSettings newValue);
+
+        internal VisualElement CreateGUI(
+            ValueChangedCallback valueChangedCallback,
+            DiffusionProfileSettings fieldToDraw,
+            string labelName,
+            out VisualElement propertyColorField,
+            int indentLevel = 0)
+        {
+            var objectField = new ObjectField { value = fieldToDraw, objectType = typeof(DiffusionProfileSettings)};
+
+            if (valueChangedCallback != null)
+            {
+                objectField.RegisterValueChangedCallback(evt => { valueChangedCallback((DiffusionProfileSettings) evt.newValue); });
+            }
+
+            propertyColorField = objectField;
+
+            var defaultRow = new PropertyRow(PropertyDrawerUtils.CreateLabel(labelName, indentLevel));
+            defaultRow.Add(propertyColorField);
+            defaultRow.styleSheets.Add(Resources.Load<StyleSheet>("Styles/PropertyRow"));
+            return defaultRow;
+        }
+
+        public Action inspectorUpdateDelegate { get; set; }
+
+        public VisualElement DrawProperty(PropertyInfo propertyInfo, object actualObject, InspectableAttribute attribute)
+        {
+            return this.CreateGUI(
+                // Use the setter from the provided property as the callback
+                newValue => propertyInfo.GetSetMethod(true).Invoke(actualObject, new object[] {newValue}),
+                (DiffusionProfileSettings) propertyInfo.GetValue(actualObject),
+                attribute.labelName,
+                out var propertyVisualElement);
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor.Graphing;
+using UnityEngine;
+using UnityEditor.ShaderGraph.Drawing;
+using UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers;
+using UnityEditor.ShaderGraph.Internal;
+using UnityEngine.Rendering.HighDefinition;
+using UnityEditor.ShaderGraph;
+using System.Globalization;
+using static UnityEditor.ShaderGraph.Drawing.Inspector.PropertyDrawers.ShaderInputPropertyDrawer;
+
+namespace UnityEditor.Rendering.HighDefinition
+{
+    [Serializable]
+    [BlackboardInputInfo(55)]
+    class DiffusionProfileShaderProperty : AbstractShaderProperty<LazyLoadReference<DiffusionProfileSettings>>, IShaderPropertyDrawer
+    {
+        internal DiffusionProfileShaderProperty()
+        {
+            displayName = "Diffusion Profile";
+        }
+
+        internal override bool isBatchable => true;
+        internal override bool isExposable => true;
+        internal override bool isRenamable => true;
+        internal override bool isGpuInstanceable => true;
+
+        public override PropertyType propertyType => PropertyType.Vector1;
+
+        string assetReferenceName => $"{referenceName}_Asset";
+
+        internal override string GetPropertyBlockString()
+        {
+            uint hash = 0;
+            Vector4 asset = Vector4.zero;
+
+            if (value.isSet)
+            {
+                hash = value.asset.profile.hash;
+                asset = HDUtils.ConvertGUIDToVector4(AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(value.asset)));
+            }
+
+            /// <summary>Float to string convertion function without any loss of precision</summary>
+            string f2s(float f) => System.Convert.ToDouble(f).ToString("0." + new string('#', 339));
+
+            return
+$@"[DiffusionProfile]{referenceName}(""{displayName}"", Float) = {f2s(HDShadowUtils.Asfloat(hash))}
+[HideInInspector]{assetReferenceName}(""{displayName}"", Vector) = ({f2s(asset.x)}, {f2s(asset.y)}, {f2s(asset.z)}, {f2s(asset.w)})";
+        }
+
+        public override string GetDefaultReferenceName() => $"DiffusionProfile_{objectId}";
+
+        internal override string GetPropertyDeclarationString(string delimiter = ";") => $@"float {referenceName}{delimiter}";
+
+        internal override AbstractMaterialNode ToConcreteNode()
+        {
+            var node = new DiffusionProfileNode();
+            node.diffusionProfile = value.asset;
+            return node;
+        }
+
+        internal override PreviewProperty GetPreviewMaterialProperty()
+        {
+            return new PreviewProperty(propertyType)
+            {
+                name = referenceName,
+                floatValue = value.isSet ? HDShadowUtils.Asfloat(value.asset.profile.hash) : 0
+            };
+        }
+
+        internal override ShaderInput Copy()
+        {
+            return new DiffusionProfileShaderProperty()
+            {
+                displayName = displayName,
+                hidden = hidden,
+                value = value,
+                precision = precision,
+                gpuInstanced = gpuInstanced,
+            };
+        }
+
+        void IShaderPropertyDrawer.HandlePropertyField(PropertySheet propertySheet, PreChangeValueCallback preChangeValueCallback, PostChangeValueCallback postChangeValueCallback)
+        {
+            var diffusionProfileDrawer = new DiffusionProfilePropertyDrawer();
+
+            propertySheet.Add(diffusionProfileDrawer.CreateGUI(
+                newValue => {
+                    preChangeValueCallback("Changed Diffusion Profile");
+                    value = newValue;
+                    postChangeValueCallback(true);
+                },
+                value.asset,
+                "Diffusion Profile",
+                out var _));
+        }
+    }
+}

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/DiffusionProfilePropertyDrawer.cs.meta

@@ -7,14 +7,15 @@
 using System;
 using System.Linq;
 using UnityEngine.Rendering;
+using UnityEditor.ShaderGraph.Internal;
 
 namespace UnityEditor.Rendering.HighDefinition
 {
     [SRPFilter(typeof(HDRenderPipeline))]
     [Title("Input", "High Definition Render Pipeline", "Diffusion Profile")]
     [FormerName("UnityEditor.Experimental.Rendering.HDPipeline.DiffusionProfileNode")]
     [FormerName("UnityEditor.ShaderGraph.DiffusionProfileNode")]
-    class DiffusionProfileNode : AbstractMaterialNode, IGeneratesBodyCode
+    class DiffusionProfileNode : AbstractMaterialNode, IGeneratesBodyCode, IPropertyFromNode
     {
         public DiffusionProfileNode()
         {
@@ -110,5 +111,15 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
             // Note: we don't use the auto precision here because we need a 32 bit to store this value
             sb.AppendLine(string.Format("float {0} = asfloat(uint({1}));", GetVariableNameForSlot(0), hash));
         }
+
+        public AbstractShaderProperty AsShaderProperty()
+        {
+            var prop = new DiffusionProfileShaderProperty { value = diffusionProfile };
+            if (diffusionProfile != null)
+                prop.displayName = diffusionProfile.name;
+            return prop;
+        }
+
+        public int outputSlotId => kOutputSlotId;
     }
 }

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

@@ -8,6 +8,7 @@ namespace UnityEditor.ShaderGraph.Internal
 {
     [Serializable]
     [FormerName("UnityEditor.ShaderGraph.BooleanShaderProperty")]
+    [BlackboardInputInfo(20)]
     public sealed class BooleanShaderProperty : AbstractShaderProperty<bool>
     {
         internal BooleanShaderProperty()

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/DiffusionProfileShaderProperty.cs.meta

@@ -7,6 +7,7 @@ namespace UnityEditor.ShaderGraph.Internal
 {
     [Serializable]
     [FormerName("UnityEditor.ShaderGraph.ColorShaderProperty")]
+    [BlackboardInputInfo(10)]
     public sealed class ColorShaderProperty : AbstractShaderProperty<Color>
     {
         internal ColorShaderProperty()