HDRP sub targets refactor

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

@@ -15,14 +15,16 @@ namespace UnityEditor.Rendering.HighDefinition.ShaderGraph
 {
     sealed partial class DecalSubTarget : HDSubTarget, ILegacyTarget, IRequiresData<DecalData>
     {
-        static string passTemplatePath => $"{HDUtils.GetHDRenderPipelinePath()}Editor/Material/Decal/ShaderGraph/DecalPass.template";
-
         public DecalSubTarget() => displayName = "Decal";
 
+        public static string passTemplatePath => $"{HDUtils.GetHDRenderPipelinePath()}Editor/Material/Decal/ShaderGraph/DecalPass.template";
+
+        protected override string templatePath => passTemplatePath;
         protected override string subTargetAssetGuid => "3ec927dfcb5d60e4883b2c224857b6c2";
         protected override string customInspector => "Rendering.HighDefinition.DecalGUI";
         protected override string renderType => HDRenderTypeTags.Opaque.ToString();
         protected override string renderQueue => HDRenderQueue.GetShaderTagValue(HDRenderQueue.ChangeType(HDRenderQueue.RenderQueueType.Opaque, decalData.drawOrder, false));
+        protected override ShaderID shaderID => HDShaderUtils.ShaderID.SG_Lit;
 
         // Material Data
         DecalData m_DecalData;
@@ -84,8 +86,6 @@ protected override void AddInspectorPropertyBlocks(SubTargetPropertiesGUI blockL
             blockList.AddPropertyBlock(new DecalPropertyBlock(decalData));
         }
 
-        protected override ShaderID shaderID => HDShaderUtils.ShaderID.SG_Lit;
-
         public override void CollectShaderProperties(PropertyCollector collector, GenerationMode generationMode)
         {
             Vector1ShaderProperty drawOrder = new Vector1ShaderProperty();
@@ -575,6 +575,7 @@ static class Descriptors
             };
         }
 #endregion
+        // protected override IncludeCollection subShaderIncludes => "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Decal/Decal.hlsl";
 
 #region Includes
         static class DecalIncludes

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

@@ -19,5 +19,13 @@ public MaterialType materialType
             get => m_MaterialType;
             set => m_MaterialType = value;
         }
+
+        [SerializeField]
+        bool m_SubsurfaceScattering = false;
+        public bool subsurfaceScattering
+        {
+            get => m_SubsurfaceScattering;
+            set => m_SubsurfaceScattering = value;
+        }
     }
 }

com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyePass.template

@@ -250,7 +250,10 @@ Pass
         // Perform alpha test very early to save performance (a killed pixel will not sample textures)
         // TODO: split graph evaluation to grab just alpha dependencies first? tricky..
         #ifdef _ALPHATEST_ON
-            $DoAlphaTest: DoAlphaTest(surfaceDescription.Alpha, surfaceDescription.AlphaClipThreshold);
+            $DoAlphaTest:         GENERIC_ALPHA_TEST(surfaceDescription.Alpha, surfaceDescription.AlphaClipThreshold);
+            $DoAlphaTestPrepass:  GENERIC_ALPHA_TEST(surfaceDescription.Alpha, surfaceDescription.AlphaClipThresholdDepthPrepass);
+            $DoAlphaTestPostpass: GENERIC_ALPHA_TEST(surfaceDescription.Alpha, surfaceDescription.AlphaClipThresholdDepthPostpass);
+            $DoAlphaTestShadow:   GENERIC_ALPHA_TEST(surfaceDescription.Alpha, surfaceDescription.AlphaClipThresholdShadow);
         #endif
 
         $DepthOffset: ApplyDepthOffsetPositionInput(V, surfaceDescription.DepthOffset, GetViewForwardDir(), GetWorldToHClipMatrix(), posInput);
@@ -264,7 +267,10 @@ Pass
 
         #ifdef _ALPHATEST_ON
             // Used for sharpening by alpha to mask
-            $DoAlphaTest: builtinData.alphaClipTreshold = surfaceDescription.AlphaClipThreshold;
+            $DoAlphaTest:         builtinData.alphaClipTreshold = surfaceDescription.AlphaClipThreshold;
+            $DoAlphaTestPrepass:  builtinData.alphaClipTreshold = surfaceDescription.AlphaClipThresholdDepthPrepass;
+            $DoAlphaTestPostpass: builtinData.alphaClipTreshold = surfaceDescription.AlphaClipThresholdDepthPostpass;
+            $DoAlphaTestShadow:   builtinData.alphaClipTreshold = surfaceDescription.AlphaClipThresholdShadow;
         #endif
 
         // override sampleBakedGI:

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

@@ -31,7 +31,7 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             systemData.alphaTestDepthPostpass = eyeMasterNode.m_AlphaTestDepthPostpass;
             systemData.sortPriority = eyeMasterNode.m_SortPriority;
             systemData.doubleSidedMode = eyeMasterNode.m_DoubleSidedMode;
-            systemData.zWrite = eyeMasterNode.m_ZWrite;
+            systemData.transparentZWrite = eyeMasterNode.m_ZWrite;
             systemData.transparentCullMode = eyeMasterNode.m_transparentCullMode;
             systemData.zTest = eyeMasterNode.m_ZTest;
             systemData.supportLodCrossFade = eyeMasterNode.m_SupportLodCrossFade;
@@ -49,8 +49,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             lightingData.receiveSSRTransparent = eyeMasterNode.m_ReceivesSSRTransparent;
             lightingData.specularOcclusionMode = eyeMasterNode.m_SpecularOcclusionMode;
             lightingData.overrideBakedGI = eyeMasterNode.m_overrideBakedGI;
-            lightingData.subsurfaceScattering = eyeMasterNode.m_SubsurfaceScattering;
 
+            eyeData.subsurfaceScattering = eyeMasterNode.m_SubsurfaceScattering;
             eyeData.materialType = (EyeData.MaterialType)eyeMasterNode.m_MaterialType;
             target.customEditorGUI = eyeMasterNode.m_OverrideEnabled ? eyeMasterNode.m_ShaderGUIOverride : "";
 
@@ -84,9 +84,9 @@ bool AdditionalSlotMaskTests(EyeMasterNode1.SlotMask slotMask)
                     case EyeMasterNode1.SlotMask.SpecularOcclusion:
                         return lightingData.specularOcclusionMode == SpecularOcclusionMode.Custom;
                     case EyeMasterNode1.SlotMask.DiffusionProfile:
-                        return lightingData.subsurfaceScattering;
+                        return eyeData.subsurfaceScattering;
                     case EyeMasterNode1.SlotMask.SubsurfaceMask:
-                        return lightingData.subsurfaceScattering;
+                        return eyeData.subsurfaceScattering;
                     case EyeMasterNode1.SlotMask.AlphaClipThreshold:
                         return systemData.alphaTest;
                     default: