[8.x.x Backport] Fix pre/post pass sg properties #82 (#86)

alelievr · sebastienlagarde · web-flow · commit 990903f7744e · 2020-05-05T19:59:16.000+02:00
* Fix depth pre/post passes not correctly enabled when switching shaders on the material

# Conflicts:
#	com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitMasterNode.cs
#	com.unity.render-pipelines.high-definition/Editor/Material/Unlit/HDShaderGUI.cs
#	com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDSubShaderUtilities.cs

* Hide prepass and postpass in the material UI

# Conflicts:
#	com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs

* Updated changelog

Co-authored-by: sebastienlagarde &lt;sebastien@unity3d.com&gt;
diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md
@@ -77,6 +77,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed scalarization code for contact shadows
 - Fix MaterialBalls having same guid issue
 - Fix spelling and grammatical errors in material samples
+- Fixed depth prepass and postpass being disabled after changing the shader in the material UI.
 
 ### Changed
 - Rejecting history for ray traced reflections based on a threshold evaluated on the neighborhood of the sampled history.
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeGUI.cs
@@ -14,7 +14,8 @@ class EyeGUI : HDShaderGUI
         // For surface option shader graph we only want all unlit features but alpha clip, back then front rendering and SSR
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeMasterNode.cs
@@ -783,6 +783,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricGUI.cs
@@ -15,7 +15,8 @@ class FabricGUI : HDShaderGUI
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
             ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricMasterNode.cs
@@ -794,6 +794,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairGUI.cs
@@ -15,7 +15,8 @@ class HairGUI : HDShaderGUI
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
             ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairMasterNode.cs
@@ -899,6 +899,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitGUI.cs
@@ -15,7 +15,8 @@ class HDLitGUI : HDShaderGUI
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
             ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitMasterNode.cs
@@ -1119,6 +1119,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitGUI.cs
@@ -15,7 +15,8 @@ class StackLitGUI : HDShaderGUI
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
             ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
-            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;
+            ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitMasterNode.cs
@@ -1424,6 +1424,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs
@@ -26,6 +26,7 @@ public enum Features
             ReceiveSSR                  = 1 << 8,
             ShowAfterPostProcessPass    = 1 << 9,
             Unlit                       = Surface | BlendMode | DoubleSided | DoubleSidedNormalMode | AlphaCutoff | AlphaCutoffShadowThreshold | AlphaCutoffThreshold | BackThenFrontRendering | ShowAfterPostProcessPass,
+            ShowPrePassAndPostPass      = 1 << 11,
             Lit                         = All,
             All                         = ~0,
         }
@@ -483,11 +484,14 @@ void DrawSurfaceGUI()
                 if (transparentBackfaceEnable != null)
                     materialEditor.ShaderProperty(transparentBackfaceEnable, Styles.transparentBackfaceEnableText);
 
-                if (transparentDepthPrepassEnable != null)
-                    materialEditor.ShaderProperty(transparentDepthPrepassEnable, Styles.transparentDepthPrepassEnableText);
+                if ((m_Features & Features.ShowPrePassAndPostPass) != 0)
+                {
+                    if (transparentDepthPrepassEnable != null)
+                        materialEditor.ShaderProperty(transparentDepthPrepassEnable, Styles.transparentDepthPrepassEnableText);
 
-                if (transparentDepthPostpassEnable != null)
-                    materialEditor.ShaderProperty(transparentDepthPostpassEnable, Styles.transparentDepthPostpassEnableText);
+                    if (transparentDepthPostpassEnable != null)
+                        materialEditor.ShaderProperty(transparentDepthPostpassEnable, Styles.transparentDepthPostpassEnableText);
+                }
 
                 if (transparentWritingMotionVec != null)
                     materialEditor.ShaderProperty(transparentWritingMotionVec, Styles.transparentWritingMotionVecText);
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/HDShaderGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/HDShaderGUI.cs
@@ -90,7 +90,8 @@ protected static void ResetMaterialCustomRenderQueue(Material material)
         }
 
         readonly static string[] floatPropertiesToSynchronize = {
-            "_UseShadowThreshold", kReceivesSSR, kUseSplitLighting
+            "_UseShadowThreshold", kReceivesSSR, kUseSplitLighting,
+            kTransparentDepthPrepassEnable, kTransparentDepthPostpassEnable
         };
 
         protected static void SynchronizeShaderGraphProperties(Material material)
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitGUI.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitGUI.cs
@@ -16,7 +16,8 @@ class HDUnlitGUI : HDShaderGUI
         const SurfaceOptionUIBlock.Features   surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit
             ^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold
             ^ SurfaceOptionUIBlock.Features.DoubleSidedNormalMode
-            ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering;
+            ^ SurfaceOptionUIBlock.Features.BackThenFrontRendering
+            ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;
 
         MaterialUIBlockList uiBlocks = new MaterialUIBlockList
         {
diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitMasterNode.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitMasterNode.cs
@@ -495,6 +495,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
             );
             HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);
             HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSided.isOn ? DoubleSidedMode.Enabled : DoubleSidedMode.Disabled);
+            HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);
 
             base.CollectShaderProperties(collector, generationMode);
         }
diff --git a/com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDSubShaderUtilities.cs b/com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDSubShaderUtilities.cs
@@ -1336,6 +1336,12 @@ public static void AddDoubleSidedProperty(PropertyCollector collector, DoubleSid
             });
         }
 
+        public static void AddPrePostPassProperties(PropertyCollector collector, bool prepass, bool postpass)
+        {
+            collector.AddToggleProperty(kTransparentDepthPrepassEnable, prepass);
+            collector.AddToggleProperty(kTransparentDepthPostpassEnable, postpass);
+        }
+
         public static string RenderQueueName(HDRenderQueue.RenderQueueType value)
         {
             switch (value)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ class EyeGUI : HDShaderGUI`
`14`	`14`	`// For surface option shader graph we only want all unlit features but alpha clip, back then front rendering and SSR`
`15`	`15`	`const SurfaceOptionUIBlock.Features surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit`
`16`	`16`	`^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold`
`17`		`- ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;`
	`17`	`+ ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass`
	`18`	`+ ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;`
`18`	`19`
`19`	`20`	`MaterialUIBlockList uiBlocks = new MaterialUIBlockList`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -783,6 +783,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera`
`783`	`783`	`);`
`784`	`784`	`HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);`
`785`	`785`	`HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);`
	`786`	`+ HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);`
`786`	`787`
`787`	`788`	`base.CollectShaderProperties(collector, generationMode);`
`788`	`789`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class FabricGUI : HDShaderGUI`
`15`	`15`	`const SurfaceOptionUIBlock.Features surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit`
`16`	`16`	`^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold`
`17`	`17`	`^ SurfaceOptionUIBlock.Features.BackThenFrontRendering`
`18`		`- ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;`
	`18`	`+ ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass`
	`19`	`+ ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;`
`19`	`20`
`20`	`21`	`MaterialUIBlockList uiBlocks = new MaterialUIBlockList`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -794,6 +794,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera`
`794`	`794`	`);`
`795`	`795`	`HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, false);`
`796`	`796`	`HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);`
	`797`	`+ HDSubShaderUtilities.AddPrePostPassProperties(collector, false, false);`
`797`	`798`
`798`	`799`	`base.CollectShaderProperties(collector, generationMode);`
`799`	`800`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class HairGUI : HDShaderGUI`
`15`	`15`	`const SurfaceOptionUIBlock.Features surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit`
`16`	`16`	`^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold`
`17`	`17`	`^ SurfaceOptionUIBlock.Features.BackThenFrontRendering`
`18`		`- ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;`
	`18`	`+ ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass`
	`19`	`+ ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;`
`19`	`20`
`20`	`21`	`MaterialUIBlockList uiBlocks = new MaterialUIBlockList`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -899,6 +899,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera`
`899`	`899`	`);`
`900`	`900`	`HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);`
`901`	`901`	`HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);`
	`902`	`+ HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);`
`902`	`903`
`903`	`904`	`base.CollectShaderProperties(collector, generationMode);`
`904`	`905`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class HDLitGUI : HDShaderGUI`
`15`	`15`	`const SurfaceOptionUIBlock.Features surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit`
`16`	`16`	`^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold`
`17`	`17`	`^ SurfaceOptionUIBlock.Features.BackThenFrontRendering`
`18`		`- ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;`
	`18`	`+ ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass`
	`19`	`+ ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;`
`19`	`20`
`20`	`21`	`MaterialUIBlockList uiBlocks = new MaterialUIBlockList`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1119,6 +1119,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera`
`1119`	`1119`	`);`
`1120`	`1120`	`HDSubShaderUtilities.AddAlphaCutoffShaderProperties(collector, alphaTest.isOn, alphaTestShadow.isOn);`
`1121`	`1121`	`HDSubShaderUtilities.AddDoubleSidedProperty(collector, doubleSidedMode);`
	`1122`	`+ HDSubShaderUtilities.AddPrePostPassProperties(collector, alphaTestDepthPrepass.isOn, alphaTestDepthPostpass.isOn);`
`1122`	`1123`
`1123`	`1124`	`base.CollectShaderProperties(collector, generationMode);`
`1124`	`1125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class StackLitGUI : HDShaderGUI`
`15`	`15`	`const SurfaceOptionUIBlock.Features surfaceOptionFeatures = SurfaceOptionUIBlock.Features.Unlit`
`16`	`16`	`^ SurfaceOptionUIBlock.Features.AlphaCutoffThreshold`
`17`	`17`	`^ SurfaceOptionUIBlock.Features.BackThenFrontRendering`
`18`		`- ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass;`
	`18`	`+ ^ SurfaceOptionUIBlock.Features.ShowAfterPostProcessPass`
	`19`	`+ ^ SurfaceOptionUIBlock.Features.ShowPrePassAndPostPass;`
`19`	`20`
`20`	`21`	`MaterialUIBlockList uiBlocks = new MaterialUIBlockList`
`21`	`22`	`{`