Unity-Technologies · sebastienlagarde · Jun 2, 2020 · Jun 1, 2020 · Jun 1, 2020 · Jun 1, 2020
diff --git a/com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs b/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;
@@ -338,8 +340,58 @@ 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)
-            => HDShaderUtils.ResetMaterialKeywords(material);
+        {
+            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

diff --git a/...der-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs b/...der-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs
@@ -33,15 +33,20 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
 
         void UpgradePBRMasterNode(PBRMasterNode1 pbrMasterNode, out Dictionary<BlockFieldDescriptor, int> blockMap)
         {
+            m_MigrateFromOldCrossPipelineSG = true;
+
             // Set data
             systemData.surfaceType = (SurfaceType)pbrMasterNode.m_SurfaceType;
             systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)pbrMasterNode.m_AlphaMode);
             systemData.doubleSidedMode = pbrMasterNode.m_TwoSided ? DoubleSidedMode.Enabled : DoubleSidedMode.Disabled;
             systemData.alphaTest = HDSubShaderUtilities.UpgradeLegacyAlphaClip(pbrMasterNode);
-            systemData.dotsInstancing = pbrMasterNode.m_DOTSInstancing;
+            systemData.dotsInstancing = false;
             builtinData.addPrecomputedVelocity = false;
             lightingData.blendPreserveSpecular = false;
             lightingData.normalDropOffSpace = pbrMasterNode.m_NormalDropOffSpace;
+            lightingData.receiveDecals = false;
+            lightingData.receiveSSR = true;
+            lightingData.receiveSSRTransparent = false;
             litData.materialType = pbrMasterNode.m_Model == PBRMasterNode1.Model.Specular ? HDLitData.MaterialType.SpecularColor : HDLitData.MaterialType.Standard;
             litData.energyConservingSpecular = false;
             target.customEditorGUI = pbrMasterNode.m_OverrideEnabled ? pbrMasterNode.m_ShaderGUIOverride : "";

diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDSubTarget.cs
@@ -17,6 +17,7 @@ abstract class HDSubTarget : SubTarget<HDTarget>, IHasMetadata,
         IRequiresData<SystemData>
     {
         SystemData m_SystemData;
+        protected bool m_MigrateFromOldCrossPipelineSG; // Use only for the migration to shader stack architecture
 
         // Interface Properties
         SystemData IRequiresData<SystemData>.data
@@ -53,6 +54,7 @@ public virtual ScriptableObject GetMetadataObject()
         {
             var hdMetadata = ScriptableObject.CreateInstance<HDMetadata>();
             hdMetadata.shaderID = shaderID;
+            hdMetadata.migrateFromOldCrossPipelineSG = m_MigrateFromOldCrossPipelineSG;
             return hdMetadata;
         }
 
@@ -107,4 +109,4 @@ public override object saveContext
             }
         } 
     }
-}
+}
diff --git a/...pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs b/...pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs
@@ -33,14 +33,16 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
 
         void UpgradeUnlitMasterNode(UnlitMasterNode1 unlitMasterNode, out Dictionary<BlockFieldDescriptor, int> blockMap)
         {
+            m_MigrateFromOldCrossPipelineSG = true;
+
             // Set data
             systemData.surfaceType = (SurfaceType)unlitMasterNode.m_SurfaceType;
             systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)unlitMasterNode.m_AlphaMode);
             systemData.doubleSidedMode = unlitMasterNode.m_TwoSided ? DoubleSidedMode.Enabled : DoubleSidedMode.Disabled;
             systemData.alphaTest = HDSubShaderUtilities.UpgradeLegacyAlphaClip(unlitMasterNode);
-            systemData.dotsInstancing = unlitMasterNode.m_DOTSInstancing;
+            systemData.dotsInstancing = false;
             systemData.zWrite = false;
-            builtinData.addPrecomputedVelocity = unlitMasterNode.m_AddPrecomputedVelocity;
+            builtinData.addPrecomputedVelocity = false;
             target.customEditorGUI = unlitMasterNode.m_OverrideEnabled ? unlitMasterNode.m_ShaderGUIOverride : "";
 
             // Set blockmap
@@ -105,4 +107,4 @@ void UpgradeHDUnlitMasterNode(HDUnlitMasterNode1 hdUnlitMasterNode, out Dictiona
             }
         }
     }
-}
+}
diff --git a/com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDMetadata.cs b/com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDMetadata.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 using UnityEditor.Rendering.HighDefinition;
 
@@ -10,10 +10,19 @@ sealed class HDMetadata : ScriptableObject
         [SerializeField]
         HDShaderUtils.ShaderID m_ShaderID;
 
+        [SerializeField]
+        bool m_MigrateFromOldCrossPipelineSG; // Keep track from which old SG master node we come from
+
         public HDShaderUtils.ShaderID shaderID
         {
             get => m_ShaderID;
             set => m_ShaderID = value;
         }
+
+        public bool migrateFromOldCrossPipelineSG
+        {
+            get => m_MigrateFromOldCrossPipelineSG;
+            set => m_MigrateFromOldCrossPipelineSG = value;
+        }
     }
 }
diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs
@@ -284,7 +284,7 @@ void UpgradeAlphaClip()
                     m_AlphaMode = (AlphaMode)unlitMasterNode.m_AlphaMode;
                     m_TwoSided = unlitMasterNode.m_TwoSided;
                     UpgradeAlphaClip();
-                    m_AddPrecomputedVelocity = unlitMasterNode.m_AddPrecomputedVelocity;
+                    m_AddPrecomputedVelocity = false;
                     m_CustomEditorGUI = unlitMasterNode.m_OverrideEnabled ? unlitMasterNode.m_ShaderGUIOverride : "";
                     break;
                 case SpriteLitMasterNode1 spriteLitMasterNode:

diff --git a/com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs b/com.unity.shadergraph/Editor/Data/Legacy/PBRMasterNode1.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEditor.Graphing;
 
@@ -32,7 +32,6 @@ public enum Model
         public AlphaMode m_AlphaMode;
         public bool m_TwoSided;
         public NormalDropOffSpace m_NormalDropOffSpace;
-        public bool m_DOTSInstancing;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;
     }

diff --git a/com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs b/com.unity.shadergraph/Editor/Data/Legacy/UnlitMasterNode1.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEditor.Graphing;
 
@@ -24,8 +24,6 @@ public enum AlphaMode
         public SurfaceType m_SurfaceType;
         public AlphaMode m_AlphaMode;
         public bool m_TwoSided;
-        public bool m_AddPrecomputedVelocity;
-        public bool m_DOTSInstancing;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;
     }