Review fixes

anisunity · anisunity · commit f6cca553cac5 · 2020-11-20T16:38:39.000+01:00
diff --git a/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_DXR_Tests/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset
@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_PerformanceTests/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/HDRPProjectSettings.asset
@@ -22,4 +22,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/VisualEffectGraph_HDRP/ProjectSettings/HDRPProjectSettings.asset
@@ -19,4 +19,4 @@ MonoBehaviour:
   m_WizardActiveTab: 0
   m_WizardNeedRestartAfterChangingToDX12: 0
   m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
-  m_LastMaterialVersion: 11
+  m_LastMaterialVersion: 12
diff --git a/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs b/com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/FrameSettingsUI.Drawers.cs
@@ -201,9 +201,9 @@ static void Drawer_SectionRenderingSettings(SerializedFrameSettings serialized,
 
             // Due to various reasons, MSAA and ray tracing are not compatible, if ray tracing is enabled on the asset. MSAA can not be enabled on the frame settings.
             bool emissiveAsForwardCanBeEnabled = ((hdrpAssetSupportDeferred && (frameSettingsOverrideToDeferred || defaultDeferredUsed)) || hdrpAssetIsDeferred);
-            area.AmmendInfo(FrameSettingsField.EmissiveAsForward,
+            area.AmmendInfo(FrameSettingsField.LitEmissiveAsForward,
                 overrideable: () => emissiveAsForwardCanBeEnabled,
-                overridedDefaultValue: emissiveAsForwardCanBeEnabled && defaultFrameSettings.IsEnabled(FrameSettingsField.EmissiveAsForward),
+                overridedDefaultValue: emissiveAsForwardCanBeEnabled && defaultFrameSettings.IsEnabled(FrameSettingsField.LitEmissiveAsForward),
                 customOverrideable: () =>
                 {
                     switch (hdrpSettings.supportedLitShaderMode)
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
@@ -953,6 +953,7 @@ Shader "HDRP/LayeredLit"
 
             ENDHLSL
         }
+
         Pass
         {
             Name "RayTracingPrepass"
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitTessellation.shader
@@ -895,6 +895,51 @@ Shader "HDRP/LayeredLitTessellation"
             ENDHLSL
         }
 
+        Pass
+        {
+            Name "ForwardEmissive"
+            Tags{ "LightMode" = "ForwardEmissive" }
+
+            Stencil
+            {
+                WriteMask [_StencilWriteMask]
+                Ref [_StencilRef]
+                Comp Always
+                Pass Replace
+            }
+
+            Blend One One
+            // In case of forward we want to have depth equal for opaque mesh
+            ZTest [_ZTestDepthEqualForOpaque]
+            ZWrite [_ZWrite]
+            Cull [_CullModeForward]
+            ColorMask 0 1
+
+            HLSLPROGRAM
+
+            #pragma only_renderers d3d11 playstation xboxone vulkan metal switch
+            //enable GPU instancing support
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #pragma multi_compile _ DOTS_INSTANCING_ON
+            // enable dithering LOD crossfade
+            #pragma multi_compile _ LOD_FADE_CROSSFADE
+
+            #define SHADERPASS SHADERPASS_FORWARD_EMISSIVE
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/ShaderPass/LitSharePass.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitData.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassForwardEmissive.hlsl"
+
+            #pragma vertex Vert
+            #pragma fragment Frag
+            #pragma hull Hull
+            #pragma domain Domain
+
+            ENDHLSL
+        }
+        
         Pass
         {
             Name "FullScreenDebug"
diff --git a/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader b/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitTessellation.shader
@@ -828,6 +828,51 @@ Shader "HDRP/LitTessellation"
             ENDHLSL
         }
 
+        Pass
+        {
+            Name "ForwardEmissive"
+            Tags{ "LightMode" = "ForwardEmissive" }
+
+            Stencil
+            {
+                WriteMask [_StencilWriteMask]
+                Ref [_StencilRef]
+                Comp Always
+                Pass Replace
+            }
+
+            Blend One One
+            // In case of forward we want to have depth equal for opaque mesh
+            ZTest [_ZTestDepthEqualForOpaque]
+            ZWrite [_ZWrite]
+            Cull [_CullModeForward]
+            ColorMask 0 1
+
+            HLSLPROGRAM
+
+            #pragma only_renderers d3d11 playstation xboxone vulkan metal switch
+            //enable GPU instancing support
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #pragma multi_compile _ DOTS_INSTANCING_ON
+            // enable dithering LOD crossfade
+            #pragma multi_compile _ LOD_FADE_CROSSFADE
+
+            #define SHADERPASS SHADERPASS_FORWARD_EMISSIVE
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/ShaderPass/LitSharePass.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl"
+            #include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassForwardEmissive.hlsl"
+
+            #pragma vertex Vert
+            #pragma fragment Frag
+            #pragma hull Hull
+            #pragma domain Domain
+
+            ENDHLSL
+        }
+
         Pass
         {
             Name "TransparentDepthPostpass"
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.RenderGraph.cs
@@ -586,7 +586,7 @@ void RenderForwardEmissiveOpaque(RenderGraph        renderGraph,
             DBufferOutput               dbuffer,
             CullingResults              cullResults)
         {
-            if (!hdCamera.frameSettings.IsEnabled(FrameSettingsField.EmissiveAsForward))
+            if (!hdCamera.frameSettings.IsEnabled(FrameSettingsField.LitEmissiveAsForward))
                 return;
 
             if (!hdCamera.frameSettings.IsEnabled(FrameSettingsField.OpaqueObjects))
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
@@ -1349,7 +1349,7 @@ void UpdateShaderVariablesGlobalCB(HDCamera hdCamera, CommandBuffer cmd)
                 m_ShaderVariablesGlobalCB._EnableRecursiveRayTracing = 0;
             }
 
-            m_ShaderVariablesGlobalCB._EmissiveAsForwardForDeferred = hdCamera.frameSettings.IsEnabled(FrameSettingsField.EmissiveAsForward) ? 1 : 0;
+            m_ShaderVariablesGlobalCB._EmissiveAsForwardForDeferred = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LitEmissiveAsForward) ? 1 : 0;
 
             ConstantBuffer.PushGlobal(cmd, m_ShaderVariablesGlobalCB, HDShaderIDs._ShaderVariablesGlobal);
         }
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.Migration.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.Migration.cs
@@ -440,7 +440,7 @@ internal static void MigrateVirtualTexturing(ref FrameSettings cameraFrameSettin
 
         internal static void MigrateEmissiveAsForward(ref FrameSettings cameraFrameSettings)
         {
-            cameraFrameSettings.SetEnabled(FrameSettingsField.EmissiveAsForward, false);
+            cameraFrameSettings.SetEnabled(FrameSettingsField.LitEmissiveAsForward, false);
         }
     }
 }
diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Settings/FrameSettings.cs
@@ -106,8 +106,8 @@ public enum FrameSettingsField
         [FrameSettingsField(0, displayedName: "Alpha To Mask", positiveDependencies: new[] { MSAA }, customOrderInGroup: 3, tooltip: "When enabled, Cameras using these Frame Settings use Alpha To Mask. Activate MSAA to access this option.")]
         AlphaToMask = 56,
         /// <summary>When enabled, The emissive part of the materials is rendered as a forward pass for the deferred pipeline.</summary>
-        [FrameSettingsField(0, displayedName: "Emissive as Forward", positiveDependencies: new[] { LitShaderMode }, customOrderInGroup: 3, tooltip: "When enabled, The emissive part of the materials is rendered as a forward pass for the deferred pipeline.")]
-        EmissiveAsForward = 57,
+        [FrameSettingsField(0, displayedName: "Lit Emissive as Forward", positiveDependencies: new[] { LitShaderMode }, customOrderInGroup: 3, tooltip: "When enabled, The emissive part of the materials is rendered as a forward pass for the deferred pipeline.")]
+        LitEmissiveAsForward = 57,
         /// <summary>When enabled, Cameras using these Frame Settings render opaque GameObjects.</summary>
         [FrameSettingsField(0, autoName: OpaqueObjects, customOrderInGroup: 4, tooltip: "When enabled, Cameras using these Frame Settings render opaque GameObjects.")]
         OpaqueObjects = 2,
@@ -762,7 +762,7 @@ internal static void Sanitize(ref FrameSettings sanitizedFrameSettings, Camera c
             // TODO: The work will be implemented piecemeal to support all passes
             bool msaa = sanitizedFrameSettings.bitDatas[(int)FrameSettingsField.MSAA] &= renderPipelineSettings.supportMSAA && sanitizedFrameSettings.litShaderMode == LitShaderMode.Forward && !pipelineSupportsRayTracing;
             sanitizedFrameSettings.bitDatas[(int)FrameSettingsField.AlphaToMask] &= msaa;
-            sanitizedFrameSettings.bitDatas[(int)FrameSettingsField.EmissiveAsForward] &= sanitizedFrameSettings.litShaderMode == LitShaderMode.Deferred;
+            sanitizedFrameSettings.bitDatas[(int)FrameSettingsField.LitEmissiveAsForward] &= sanitizedFrameSettings.litShaderMode == LitShaderMode.Deferred;
 
             // No recursive reflections
             bool ssr = sanitizedFrameSettings.bitDatas[(int)FrameSettingsField.SSR] &= renderPipelineSettings.supportSSR && !msaa && !preview;

Original file line number	Diff line number	Diff line change
`@@ -953,6 +953,7 @@ Shader "HDRP/LayeredLit"`
`953`	`953`
`954`	`954`	`ENDHLSL`
`955`	`955`	`}`
	`956`	`+`
`956`	`957`	`Pass`
`957`	`958`	`{`
`958`	`959`	`Name "RayTracingPrepass"`