[8.x.x Backport] Fix pre/post pass sg properties #82 by alelievr · Pull Request #86 · Unity-Technologies/Graphics · GitHub
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastienlagarde merged 4 commits into from
May 5, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
482cef4
Fix depth pre/post passes not correctly enabled when switching shader…
Apr 9, 2020
091c8d3
Hide prepass and postpass in the material UI
Apr 9, 2020
864890c
Updated changelog
Apr 9, 2020
1243956
Merge branch '8.x.x/hd/staging' into 8.x.x/hd/backport/pre-post-pass-…
sebastienlagarde May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions ...y.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions ...unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions ...unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion ...nity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions ...nder-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
12 changes: 8 additions & 4 deletions com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Unlit/HDShaderGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions ...y.render-pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitMasterNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 6 additions & 0 deletions com.unity.render-pipelines.high-definition/Editor/ShaderGraph/HDSubShaderUtilities.cs
View file
Open in desktop