Exposed more option in ShaderGraph surface option

TestProjects/HDRP_DXR_Tests/Assets/Scenes/902_Materials_SG_Variants/StackLit/Shader Graphs_StackLit_Transparent.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 4
+  version: 5
 --- !u!21 &2100000
 Material:
   serializedVersion: 6
@@ -33,10 +33,9 @@ Material:
     MotionVector: User
     RenderType: Transparent
   disabledShaderPasses:
-  - MOTIONVECTORS
+  - TransparentDepthPostpass
   - TransparentBackface
   - TransparentDepthPrepass
-  - TransparentDepthPostpass
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -52,26 +51,38 @@ Material:
         m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_6ea313656c2744b59b6ca90317e3dc1c_Out_0:
+        m_Texture: {fileID: 2800000, guid: a720075b2a0ff8440bc021a465769340, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _Texture2DAsset_da5ed3679908438d89ee705e2cccd98c_Out_0:
         m_Texture: {fileID: 2800000, guid: a720075b2a0ff8440bc021a465769340, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_fb70cff2f9454b0193c4b5eaff34a18b_Out_0:
+        m_Texture: {fileID: 2800000, guid: fcecce6d2c9be8d418a27f0658a2210d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_555A0A0: 0.5
+    - _AddPrecomputedVelocity: 0
     - _AlphaCutoffEnable: 0
     - _AlphaDstBlend: 10
     - _AlphaSrcBlend: 1
     - _AlphaToMask: 0
     - _BlendMode: 0
     - _CullMode: 2
     - _CullModeForward: 2
+    - _DepthOffsetEnable: 0
     - _DoubleSidedEnable: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 10
+    - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
+    - _OpaqueCullMode: 2
     - _ReceivesSSR: 1
     - _ReceivesSSRTransparent: 0
-    - _RenderQueueType: 1
+    - _RenderQueueType: 4
     - _RequireSplitLighting: 0
     - _SrcBlend: 1
     - _StencilRef: 0
@@ -84,12 +95,14 @@ Material:
     - _StencilWriteMaskDistortionVec: 4
     - _StencilWriteMaskGBuffer: 14
     - _StencilWriteMaskMV: 40
+    - _SupportDecals: 1
     - _SurfaceType: 1
     - _TransparentBackfaceEnable: 0
     - _TransparentCullMode: 2
     - _TransparentDepthPostpassEnable: 0
     - _TransparentDepthPrepassEnable: 0
     - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
     - _TransparentZWrite: 0
     - _UseShadowThreshold: 0
     - _ZTestDepthEqualForOpaque: 4

TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/SRP_SmokeTest/ProjectSettings/HDRPProjectSettings.asset

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

TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset

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

com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2020.1-to-2020.2.md

@@ -81,6 +81,8 @@ From Unity 2020.2, HDRP includes a new rectangular area shadow evaluation functi
 
 From Unity 2020.2, the macro ENABLE_RAYTRACING, SHADEROPTIONS_RAYTRACING, and RAYTRACING_ENABLED have been removed. A new multicompile is introduce for forward pass: SCREEN_SPACE_SHADOWS_OFF SCREEN_SPACE_SHADOWS_ON. This allow to enable raytracing effect without requiring edition of shader config file.
 
+From Unity 2020.2,SHADERPASS for TransparentDepthPrepass and TransparentDepthPostpass identification is using respectively SHADERPASS_TRANSPARENT_DEPTH_PREPASS and SHADERPASS_TRANSPARENT_DEPTH_POSTPASS. Previously it was SHADERPASS_DEPTH_ONLY. Define CUTOFF_TRANSPARENT_DEPTH_PREPASS and CUTOFF_TRANSPARENT_DEPTH_POSTPASS and been removed as the new path macro can now be used.
+
 ## Custom pass API
 
 The signature of the Execute function has changed to simplify the parameters, now it only takes a CustomPassContext as its input:

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

@@ -193,6 +193,7 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
              ZWriteForTransparent,
              RenderQueueUpgrade,
              ShaderGraphStack,
+             MoreMaterialSurfaceOptionFromShaderGraph,
         };
 
         #region Migrations
@@ -393,6 +394,32 @@ static void ShaderGraphStack(Material material, HDShaderUtils.ShaderID id)
             HDShaderUtils.ResetMaterialKeywords(material);
         }
 
+        static void MoreMaterialSurfaceOptionFromShaderGraph(Material material, HDShaderUtils.ShaderID id)
+        {
+            if (material.shader.IsShaderGraph())
+            {
+                // Synchronize properties we exposed from SG to the material
+                ResetFloatProperty(kReceivesSSR);
+                ResetFloatProperty(kReceivesSSRTransparent);
+                ResetFloatProperty(kEnableDecals);
+                ResetFloatProperty(kEnableBlendModePreserveSpecularLighting);
+                ResetFloatProperty(kTransparentWritingMotionVec);
+                ResetFloatProperty(kAddPrecomputedVelocity);
+                ResetFloatProperty(kDepthOffsetEnable);
+            }
+
+            void ResetFloatProperty(string propName)
+            {
+                int propIndex = material.shader.FindPropertyIndex(propName);
+                if (propIndex == -1)
+                    return;
+                float defaultValue = material.shader.GetPropertyDefaultFloatValue(propIndex);
+                material.SetFloat(propName, defaultValue);
+            }
+
+            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/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs

@@ -27,8 +27,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             // Previous master node wasn't having any renderingPass. Assign it correctly now.
             systemData.renderingPass = systemData.surfaceType == SurfaceType.Opaque ? HDRenderQueue.RenderQueueType.Opaque : HDRenderQueue.RenderQueueType.Transparent;
             systemData.alphaTest = eyeMasterNode.m_AlphaTest;
-            systemData.alphaTestDepthPrepass = eyeMasterNode.m_AlphaTestDepthPrepass;
-            systemData.alphaTestDepthPostpass = eyeMasterNode.m_AlphaTestDepthPostpass;
+            systemData.transparentDepthPrepass = eyeMasterNode.m_AlphaTestDepthPrepass;
+            systemData.transparentDepthPostpass = eyeMasterNode.m_AlphaTestDepthPostpass;
             systemData.sortPriority = eyeMasterNode.m_SortPriority;
             systemData.doubleSidedMode = eyeMasterNode.m_DoubleSidedMode;
             systemData.transparentZWrite = eyeMasterNode.m_ZWrite;

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

@@ -25,7 +25,7 @@ sealed partial class EyeSubTarget : LightingSubTarget, ILegacyTarget, IRequiresD
         };
 
         protected override string[] templateMaterialDirectories => passTemplateMaterialDirectories;
-        protected override string customInspector => "Rendering.HighDefinition.EyeGUI";
+        protected override string customInspector => "Rendering.HighDefinition.LightingShaderGraphGUI";
         protected override string subTargetAssetGuid => "864e4e09d6293cf4d98457f740bb3301";
         protected override ShaderID shaderID => HDShaderUtils.ShaderID.SG_Eye;
         protected override string subShaderInclude => "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.hlsl";

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

@@ -26,7 +26,7 @@ sealed partial class FabricSubTarget : LightingSubTarget, ILegacyTarget, IRequir
 
         protected override string[] templateMaterialDirectories => passTemplateMaterialDirectories;
         protected override string subTargetAssetGuid => "74f1a4749bab90d429ac01d094be0aeb"; // FabricSubTarget.cs
-        protected override string customInspector => "Rendering.HighDefinition.FabricGUI";
+        protected override string customInspector => "Rendering.HighDefinition.LightingShaderGraphGUI";
         protected override ShaderID shaderID => HDShaderUtils.ShaderID.SG_Fabric;
         protected override string subShaderInclude => "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.hlsl";
         protected override string raytracingInclude => CoreIncludes.kFabricRaytracing;