From 82e509728a6dd491ad389acf547a8c3f04ae9c31 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Tue, 2 Jun 2020 00:12:48 +0200 Subject: [PATCH 1/3] Fix renderqueu generation --- .../Editor/Material/ShaderGraph/LightingSubTarget.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs index bac2f087a61..3432f56c18d 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/LightingSubTarget.cs @@ -27,8 +27,7 @@ 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); + int queue = HDRenderQueue.ChangeType(systemData.renderingPass, systemData.sortPriority, systemData.alphaTest); return HDRenderQueue.GetShaderTagValue(queue); } } @@ -126,4 +125,4 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera HDSubShaderUtilities.AddStencilShaderProperties(collector, systemData, lightingData); } } -} \ No newline at end of file +} From 229230c3f89600614f49045b92497edeb002b5a0 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Wed, 3 Jun 2020 12:40:13 +0200 Subject: [PATCH 2/3] fix renderingPass correctly --- .../Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs | 2 ++ .../Fabric/ShaderGraph/FabricSubTarget.Migration.cs | 2 ++ .../Material/Hair/ShaderGraph/HairSubTarget.Migration.cs | 2 ++ .../Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs | 3 ++- .../Editor/Material/ShaderGraph/LightingSubTarget.cs | 9 --------- .../StackLit/ShaderGraph/StackLitSubTarget.Migration.cs | 2 ++ .../Unlit/ShaderGraph/HDUnlitSubTarget.Migration.cs | 3 ++- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs index e1a14d2df52..948f9d206d1 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary.data set => m_LightingData = value; } - protected override string renderQueue - { - get - { - int queue = HDRenderQueue.ChangeType(systemData.renderingPass, systemData.sortPriority, systemData.alphaTest); - return HDRenderQueue.GetShaderTagValue(queue); - } - } - protected override string renderType => HDRenderTypeTags.HDLitShader.ToString(); public LightingData lightingData diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs index 062ba947ee3..60919f77fec 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs @@ -24,6 +24,8 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary() From 28ac563cdffc4355aa5fc8fe661d9d0389772091 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Wed, 3 Jun 2020 14:14:07 +0200 Subject: [PATCH 3/3] clean m_AddPrecomputedVelocity usuage --- .../Editor/ShaderGraph/Targets/UniversalTarget.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs index 1f90c484cc4..cd6a7114466 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalTarget.cs @@ -72,9 +72,6 @@ sealed class UniversalTarget : Target, ILegacyTarget [SerializeField] bool m_AlphaClip = false; - [SerializeField] - bool m_AddPrecomputedVelocity = false; - [SerializeField] string m_CustomEditorGUI; @@ -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; @@ -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 @@ -276,7 +266,6 @@ 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: @@ -284,7 +273,6 @@ void UpgradeAlphaClip() 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: