[Shadergraph] Master Stacks [Skip CI]

TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset

@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset

@@ -18,4 +18,4 @@ MonoBehaviour:
   m_ProjectSettingFolderPath: HDRPDefaultResources
   m_WizardPopupAtStart: 0
   m_WizardActiveTab: 0
-  m_LastMaterialVersion: 2
+  m_LastMaterialVersion: 4

TestProjects/VisualEffectGraph/ProjectSettings/HDRPProjectSettings.asset

@@ -21,4 +21,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs

@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
+using UnityEditor.ShaderGraph;
 using UnityEngine.Rendering.HighDefinition;
+using UnityEditor.Rendering.HighDefinition.ShaderGraph;
 
 // Material property names
 using static UnityEngine.Rendering.HighDefinition.HDMaterialProperties;
@@ -129,7 +131,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
                 AssetVersion assetVersion = null;
                 foreach (var subAsset in assetVersions)
                 {
-                    if (subAsset.GetType() == typeof(AssetVersion))
+                    if (subAsset != null && subAsset.GetType() == typeof(AssetVersion))
                     {
                         assetVersion = subAsset as AssetVersion;
                         break;
@@ -190,6 +192,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
              StencilRefactor,
              ZWriteForTransparent,
              RenderQueueUpgrade,
+             ShaderGraphStack,
         };
 
         #region Migrations
@@ -337,6 +340,59 @@ static void RenderQueueUpgrade(Material material, HDShaderUtils.ShaderID id)
             HDShaderUtils.ResetMaterialKeywords(material);
         }
 
+        // properties in this tab should be properties from Unlit or PBR cross pipeline shader
+        // that are suppose to be synchronize with the Material during upgrade
+        readonly static string[] s_ShadergraphStackFloatPropertiesToSynchronize = {
+            "_SurfaceType",
+            "_BlendMode",
+            "_DstBlend",
+            "_SrcBlend",
+            "_AlphaDstBlend",
+            "_AlphaSrcBlend",
+            "_AlphaCutoff",
+            "_AlphaCutoffEnable",
+            "_DoubleSidedEnable",
+            "_DoubleSidedNormalMode",
+            "_ZWrite", // Needed to fix older bug
+            "_RenderQueueType"  // Needed as seems to not reset correctly
+        };
+
+        static void ShaderGraphStack(Material material, HDShaderUtils.ShaderID id)
+        {
+            Shader shader = material.shader;
+
+            if (shader.IsShaderGraph())
+            {
+                if (shader.TryGetMetadataOfType<HDMetadata>(out var obj))
+                {
+                    // Material coming from old cross pipeline shader (Unlit and PBR) are not synchronize correctly with their
+                    // shader graph. This code below ensure it is
+                    if (obj.migrateFromOldCrossPipelineSG) // come from PBR or Unlit cross pipeline SG?
+                    {
+                        var defaultProperties = new Material(material.shader);
+
+                        foreach (var floatToSync in s_ShadergraphStackFloatPropertiesToSynchronize)
+                            if (material.HasProperty(floatToSync))
+                                material.SetFloat(floatToSync, defaultProperties.GetFloat(floatToSync));
+
+                        defaultProperties = null;
+
+                        // Postprocess now that material is correctly sync
+                        bool isTransparent = material.HasProperty("_SurfaceType") && material.GetFloat("_SurfaceType") > 0.0f;
+                        bool alphaTest = material.HasProperty("_AlphaCutoffEnable") && material.GetFloat("_AlphaCutoffEnable") > 0.0f;
+
+                        material.renderQueue = isTransparent ? (int)HDRenderQueue.Priority.Transparent :
+                                                    alphaTest ? (int)HDRenderQueue.Priority.OpaqueAlphaTest : (int)HDRenderQueue.Priority.Opaque;
+
+                        material.SetFloat("_RenderQueueType", isTransparent ? (float)HDRenderQueue.RenderQueueType.Transparent : (float)HDRenderQueue.RenderQueueType.Opaque);
+                    }
+
+                }
+            }
+
+            HDShaderUtils.ResetMaterialKeywords(material);
+        }
+
         #region Serialization_API
         //Methods in this region interact on the serialized material
         //without filtering on what used shader knows

com.unity.render-pipelines.high-definition/Editor/AssetProcessors/ShaderGraphMaterialsUpdater.cs

@@ -26,7 +26,7 @@ static void OnShaderGraphSaved(Shader shader, object saveContext)
             if (!(saveContext is HDSaveContext hdSaveContext))
                 return;
 
-            HDRenderPipeline.currentPipeline.ResetPathTracing();
+            HDRenderPipeline.currentPipeline?.ResetPathTracing();
 
             if (!hdSaveContext.updateMaterials)
                 return;

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

@@ -1,13 +1,33 @@
+using System;
 using UnityEditor.ShaderGraph;
 
-namespace UnityEditor.Rendering.HighDefinition
+namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     static class CreateDecalShaderGraph
     {
-        [MenuItem("Assets/Create/Shader/HDRP/Decal Graph", false, 208)]
-        public static void CreateMaterialGraph()
+        [MenuItem("Assets/Create/Shader/HDRP/Decal Shader Graph", false, 208)]
+        public static void CreateDecalGraph()
         {
-            GraphUtil.CreateNewGraph(new DecalMasterNode());
+            var target = (HDTarget)Activator.CreateInstance(typeof(HDTarget));
+            target.TrySetActiveSubTarget(typeof(DecalSubTarget));
+
+            var blockDescriptors = new [] 
+            { 
+                BlockFields.VertexDescription.Position,
+                BlockFields.VertexDescription.Normal,
+                BlockFields.VertexDescription.Tangent,
+                BlockFields.SurfaceDescription.BaseColor,
+                BlockFields.SurfaceDescription.Alpha,
+                BlockFields.SurfaceDescription.NormalTS,
+                HDBlockFields.SurfaceDescription.NormalAlpha,
+                BlockFields.SurfaceDescription.Metallic,
+                BlockFields.SurfaceDescription.Occlusion,
+                BlockFields.SurfaceDescription.Smoothness,
+                HDBlockFields.SurfaceDescription.MAOSAlpha,
+                BlockFields.SurfaceDescription.Emission,
+            };
+
+            GraphUtil.CreateNewGraphWithOutputs(new [] {target}, blockDescriptors);
         }
     }
 }

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

@@ -0,0 +1,65 @@
+using System;
+using UnityEngine;
+using UnityEngine.Rendering.HighDefinition;
+
+namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
+{
+    class DecalData : HDTargetData
+    {
+        [SerializeField]
+        bool m_AffectsMetal = true;
+        public bool affectsMetal
+        {
+            get => m_AffectsMetal;
+            set => m_AffectsMetal = value;
+        }
+
+        [SerializeField]
+        bool m_AffectsAO = true;
+        public bool affectsAO
+        {
+            get => m_AffectsAO;
+            set => m_AffectsAO = value;
+        }
+
+        [SerializeField]
+        bool m_AffectsSmoothness = true;
+        public bool affectsSmoothness
+        {
+            get => m_AffectsSmoothness;
+            set => m_AffectsSmoothness = value;
+        }
+
+        [SerializeField]
+        bool m_AffectsAlbedo = true;
+        public bool affectsAlbedo
+        {
+            get => m_AffectsAlbedo;
+            set => m_AffectsAlbedo = value;
+        }
+
+        [SerializeField]
+        bool m_AffectsNormal = true;
+        public bool affectsNormal
+        {
+            get => m_AffectsNormal;
+            set => m_AffectsNormal = value;
+        }
+
+        [SerializeField]
+        bool m_AffectsEmission = true;
+        public bool affectsEmission
+        {
+            get => m_AffectsEmission;
+            set => m_AffectsEmission = value;
+        }
+
+        [SerializeField]
+        int m_DrawOrder;
+        public int drawOrder
+        {
+            get => m_DrawOrder;
+            set => m_DrawOrder = value;
+        }
+    }
+}