Skip to content

Fix RenderQueue generation for HDRP code #691

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
merged 5 commits into from
Jun 3, 2020
Merged

Fix RenderQueue generation for HDRP code #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82e5097
Fix renderqueu generation
sebastienlagarde Jun 1, 2020
33f5669
Merge branch 'sg/master-stack' into HDRP/sg-master-stack-renderingpass
sebastienlagarde Jun 2, 2020
53a213b
Merge branch 'sg/master-stack' into HDRP/sg-master-stack-renderingpass
sebastienlagarde Jun 2, 2020
229230c
fix renderingPass correctly
sebastienlagarde Jun 3, 2020
28ac563
clean m_AddPrecomputedVelocity usuage
sebastienlagarde Jun 3, 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
2 changes: 2 additions & 0 deletions ...ender-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
// Set data
systemData.surfaceType = (SurfaceType)eyeMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)eyeMasterNode.m_AlphaMode);
// 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;
Expand Down
2 changes: 2 additions & 0 deletions ...pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
// Set data
systemData.surfaceType = (SurfaceType)fabricMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)fabricMasterNode.m_AlphaMode);
// 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 = fabricMasterNode.m_AlphaTest;
systemData.sortPriority = fabricMasterNode.m_SortPriority;
systemData.doubleSidedMode = fabricMasterNode.m_DoubleSidedMode;
Expand Down
2 changes: 2 additions & 0 deletions ...der-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
// Set data
systemData.surfaceType = (SurfaceType)hairMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)hairMasterNode.m_AlphaMode);
// 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 = hairMasterNode.m_AlphaTest;
systemData.alphaTestDepthPrepass = hairMasterNode.m_AlphaTestDepthPrepass;
systemData.alphaTestDepthPostpass = hairMasterNode.m_AlphaTestDepthPostpass;
Expand Down
3 changes: 2 additions & 1 deletion ...der-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ void UpgradePBRMasterNode(PBRMasterNode1 pbrMasterNode, out Dictionary<BlockFiel
systemData.surfaceType = (SurfaceType)pbrMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)pbrMasterNode.m_AlphaMode);
systemData.doubleSidedMode = pbrMasterNode.m_TwoSided ? DoubleSidedMode.Enabled : DoubleSidedMode.Disabled;
// 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 = HDSubShaderUtilities.UpgradeLegacyAlphaClip(pbrMasterNode);
systemData.dotsInstancing = false;
builtinData.addPrecomputedVelocity = false;
Expand All @@ -51,7 +53,6 @@ void UpgradePBRMasterNode(PBRMasterNode1 pbrMasterNode, out Dictionary<BlockFiel
litData.energyConservingSpecular = false;
litData.clearCoat = false;
target.customEditorGUI = pbrMasterNode.m_OverrideEnabled ? pbrMasterNode.m_ShaderGUIOverride : "";
systemData.TryChangeRenderingPass(systemData.renderingPass);
// Handle mapping of Normal block specifically
BlockFieldDescriptor normalBlock;
switch(lightingData.normalDropOffSpace)
Expand Down
12 changes: 1 addition & 11 deletions com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ LightingData IRequiresData<LightingData>.data
set => m_LightingData = value;
}

protected override string renderQueue
{
get
{
var renderingPass = systemData.surfaceType == SurfaceType.Opaque ? HDRenderQueue.RenderQueueType.Opaque : HDRenderQueue.RenderQueueType.Transparent;
int queue = HDRenderQueue.ChangeType(renderingPass, systemData.sortPriority, systemData.alphaTest);
return HDRenderQueue.GetShaderTagValue(queue);
}
}

protected override string renderType => HDRenderTypeTags.HDLitShader.ToString();

public LightingData lightingData
Expand Down Expand Up @@ -126,4 +116,4 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
HDSubShaderUtilities.AddStencilShaderProperties(collector, systemData, lightingData);
}
}
}
}
2 changes: 2 additions & 0 deletions ...lines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
// Set data
systemData.surfaceType = (SurfaceType)stackLitMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)stackLitMasterNode.m_AlphaMode);
// 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 = stackLitMasterNode.m_AlphaTest;
systemData.sortPriority = stackLitMasterNode.m_SortPriority;
systemData.doubleSidedMode = stackLitMasterNode.m_DoubleSidedMode;
Expand Down
3 changes: 2 additions & 1 deletion ...pipelines.high-definition/Editor/Material/Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ void UpgradeUnlitMasterNode(UnlitMasterNode1 unlitMasterNode, out Dictionary<Blo
// Set data
systemData.surfaceType = (SurfaceType)unlitMasterNode.m_SurfaceType;
systemData.blendMode = HDSubShaderUtilities.UpgradeLegacyAlphaModeToBlendMode((int)unlitMasterNode.m_AlphaMode);
// 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.doubleSidedMode = unlitMasterNode.m_TwoSided ? DoubleSidedMode.Enabled : DoubleSidedMode.Disabled;
systemData.alphaTest = HDSubShaderUtilities.UpgradeLegacyAlphaClip(unlitMasterNode);
systemData.dotsInstancing = false;
systemData.zWrite = false;
builtinData.addPrecomputedVelocity = false;
target.customEditorGUI = unlitMasterNode.m_OverrideEnabled ? unlitMasterNode.m_ShaderGUIOverride : "";
systemData.TryChangeRenderingPass(systemData.renderingPass);

// Set blockmap
blockMap = new Dictionary<BlockFieldDescriptor, int>()
Expand Down
12 changes: 0 additions & 12 deletions com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ sealed class UniversalTarget : Target, ILegacyTarget
[SerializeField]
bool m_AlphaClip = false;

[SerializeField]
bool m_AddPrecomputedVelocity = false;

[SerializeField]
string m_CustomEditorGUI;

Expand Down Expand Up @@ -140,12 +137,6 @@ public bool alphaClip
set => m_AlphaClip = value;
}

public bool addPrecomputedVelocity
{
get => m_AddPrecomputedVelocity;
set => m_AddPrecomputedVelocity = value;
}

public string customEditorGUI
{
get => m_CustomEditorGUI;
Expand Down Expand Up @@ -183,7 +174,6 @@ public override void GetFields(ref TargetFieldContext context)
context.blocks.Contains(BlockFields.VertexDescription.Tangent));
context.AddField(Fields.GraphPixel);
context.AddField(Fields.AlphaClip, alphaClip);
context.AddField(Fields.VelocityPrecomputed, addPrecomputedVelocity);
context.AddField(Fields.DoubleSided, twoSided);

// SubTarget fields
Expand Down Expand Up @@ -276,15 +266,13 @@ void UpgradeAlphaClip()
m_AlphaMode = (AlphaMode)pbrMasterNode.m_AlphaMode;
m_TwoSided = pbrMasterNode.m_TwoSided;
UpgradeAlphaClip();
m_AddPrecomputedVelocity = false;
m_CustomEditorGUI = pbrMasterNode.m_OverrideEnabled ? pbrMasterNode.m_ShaderGUIOverride : "";
break;
case UnlitMasterNode1 unlitMasterNode:
m_SurfaceType = (SurfaceType)unlitMasterNode.m_SurfaceType;
m_AlphaMode = (AlphaMode)unlitMasterNode.m_AlphaMode;
m_TwoSided = unlitMasterNode.m_TwoSided;
UpgradeAlphaClip();
m_AddPrecomputedVelocity = false;
m_CustomEditorGUI = unlitMasterNode.m_OverrideEnabled ? unlitMasterNode.m_ShaderGUIOverride : "";
break;
case SpriteLitMasterNode1 spriteLitMasterNode:
Expand Down