Revert "Automatically enable Alpha-To-Coverage when alpha clipping is on (#6599)" (#6650)

This reverts commit e7a2db2.

# Conflicts:
#	com.unity.render-pipelines.high-definition/CHANGELOG.md
#	com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2022.1-to-2022.2.md

Author: JulienIgnace-Unity

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -97,7 +97,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - The rendering order of decals that have a similar draw order value was modified. The new order should be the reverse of the previous order.
 - Render Graph object pools are now cleared with render graph cleanup
 - Updated Physically Based Sky documentation with more warnings about warmup cost.
-- Force Alpha To Coverage to be enabled when MSAA is enabled. Remove the Alpha to Mask UI control.
 - Improved the probe placement of APV when dealing with scenes that contains objects smaller than a brick.
 - Replaced the geometry distance offset in the Probe Volume component by a minimum renderer volume threshold to ignore small objects when placing probes.
 - Small improvement changes in the UX for the Unlit Distortion field.

com.unity.render-pipelines.high-definition/Documentation~/Alpha-Clipping.md

@@ -4,15 +4,14 @@ The **Alpha Clipping** option controls whether your Material acts as a [Cutout S
 
 Enable **Alpha Clipping** to create a transparent effect with hard edges between the opaque and transparent areas. HDRP achieves this effect by not rendering pixels with alpha values below the value you specify in the **Threshold** field. For example, a **Threshold** of 0.1 means that HDRP doesn't render alpha values below 0.1.
 
-When using MSAA, the new edges of the object caused by the cutout are not be taken into account for antialiasing. In this case HDRP will automatically enable Alpha To Coverage on the shader to benefit from MSAA.
-
 If you enable this feature, HDRP exposes the following properties for you to use to customize the Alpha Clipping effect:
 
 | Property                 | Description                                                  |
 | ------------------------ | ------------------------------------------------------------ |
 | **Threshold**            | Set the alpha value limit that HDRP uses to determine whether it should render each pixel. If the alpha value of the pixel is equal to or higher than the limit then HDRP renders the pixel. If the value is lower than the limit then HDRP does not render the pixel. The default value is 0.5. |
 | **Use Shadow Threshold** | Enable the checkbox to set another threshold value for alpha clipping shadows. |
 | **- Shadow Threshold**   | Set the alpha value limit that HDRP uses to determine whether it should render shadows for a pixel. |
+| **Alpha to Mask**        | Enable the checkbox to turn on alpha-to-coverage. When MSAA is used, alpha-to-coverage modifies multisample coverage mask proportionally to the pixel Shader result alpha value. This is typically used for anti-aliasing vegetation and other alpha-tested shaders.  |
 
 If you set your [Surface Type](Surface-Type.md) to **Transparent**, HDRP exposes the **Transparent Depth Prepass** and **Transparent Depth Postpass** properties. HDRP allows you to set individual thresholds for these two passes.
 

com.unity.render-pipelines.high-definition/Documentation~/Frame-Settings.md

@@ -27,7 +27,8 @@ These settings determine the method that the Cameras and Reflection Probes using
 | **Lit Shader Mode**                 | Select the Shader Mode HDRP uses for the Lit Shader when the rendering component using these Frame Settings renders the Scene. |
 | - **Depth Prepass within Deferred** | If you enable Decals then HDRP forces a depth prepass and you can not disable this feature. This feature fills the depth buffer with all Meshes, without rendering any color. It is an optimization option that depends on the Unity Project you are creating, meaning that you should measure the performance before and after you enable this feature to make sure it benefits your Project. This is only available if you set **Lit Shader Mode** to **Deferred**. |
 | - **Clear GBuffers**                | Enable the checkbox to make HDRP clear GBuffers for Cameras using these Frame Settings. This is only available if you set **Lit Shader Mode** to **Deferred**. |
-| - **MSAA**                          | Select the MSAA quality for the rendering components using these Frame Settings. This is only available if you set **Lit Shader Mode** to **Forward**. Note that using a different value for multiple different cameras will have a non negligible impact on memory consumption. When enabled, all materials with Alpha Clipping will also enable Alpha To Coverage to benefit from MSAA. |
+| - **MSAA **                         | Select the MSAA quality for the rendering components using these Frame Settings. This is only available if you set **Lit Shader Mode** to **Forward**. Note that using a different value for multiple different cameras will have a non negligible impact on memory consumption. |
+| - **Alpha To Mask**                 | Enable the checkbox to make HDRP render with **Alpha to Mask** Materials that have enabled it. This is only available if you enable **MSAA within Forward**.|
 | **Opaque Objects**                  | Enable the checkbox to make HDRP render Materials that have their **Surface Type** set to **Opaque**. If you disable this settings, Cameras/Reflection Probes using these Frame Settings do not render any opaque GameObjects. |
 | **Transparent Objects**             | Enable the checkbox to make HDRP render Materials that have their **Surface Type** set to **Transparent**. If you disable this setting, Cameras/Reflection Probes using these Frame Settings do not render any transparent GameObjects. |
 | **Decals**                          | Enable the checkbox to make HDRP process decals. Enable this on cameras that you want to render decals. |

com.unity.render-pipelines.high-definition/Documentation~/Upgrading-from-2022.1-to-2022.2.md

@@ -9,9 +9,3 @@ While Physically Based Sky is used, Directional lights can have a surface textur
 ## XR
 
 Starting from HDRP 14.x, Motion Blur is turned off by default when in XR. This behaviour can be changed in the XR section HDRP asset by enabling the option **Allow Motion Blur**.
-
-## Material
-
-### Alpha to mask
-
-Starting from HDRP 14.x, Alpha to Mask option have been removed. Alpha to Mask is always enabled now when MSAA is enabled.

com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs

@@ -692,7 +692,11 @@ void ResetFloatProperty(string propName)
 
         static void AlphaToMaskUIFix(Material material, ShaderID id)
         {
-            // Not used anymore, alpha to mask option is removed
+            if (material.HasProperty(kAlphaToMask) && material.HasProperty(kAlphaToMaskInspector))
+            {
+                material.SetFloat(kAlphaToMaskInspector, material.GetFloat(kAlphaToMask));
+                HDShaderUtils.ResetMaterialKeywords(material);
+            }
         }
 
         static void MigrateDecalRenderQueue(Material material, ShaderID id)

com.unity.render-pipelines.high-definition/Editor/Material/Eye/ShaderGraph/EyeSubTarget.Migration.cs

@@ -43,6 +43,7 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             builtinData.transparencyFog = eyeMasterNode.m_TransparencyFog;
             builtinData.addPrecomputedVelocity = eyeMasterNode.m_AddPrecomputedVelocity;
             builtinData.depthOffset = eyeMasterNode.m_depthOffset;
+            builtinData.alphaToMask = eyeMasterNode.m_AlphaToMask;
 
             lightingData.blendPreserveSpecular = eyeMasterNode.m_BlendPreserveSpecular;
             lightingData.receiveDecals = eyeMasterNode.m_ReceiveDecals;

com.unity.render-pipelines.high-definition/Editor/Material/Fabric/ShaderGraph/FabricSubTarget.Migration.cs

@@ -41,6 +41,7 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             builtinData.transparencyFog = fabricMasterNode.m_TransparencyFog;
             builtinData.addPrecomputedVelocity = fabricMasterNode.m_AddPrecomputedVelocity;
             builtinData.depthOffset = fabricMasterNode.m_depthOffset;
+            builtinData.alphaToMask = fabricMasterNode.m_AlphaToMask;
 
             lightingData.blendPreserveSpecular = fabricMasterNode.m_BlendPreserveSpecular;
             lightingData.receiveDecals = fabricMasterNode.m_ReceiveDecals;

com.unity.render-pipelines.high-definition/Editor/Material/Hair/ShaderGraph/HairSubTarget.Migration.cs

@@ -44,6 +44,7 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             builtinData.transparentWritesMotionVec = hairMasterNode.m_TransparentWritesMotionVec;
             builtinData.addPrecomputedVelocity = hairMasterNode.m_AddPrecomputedVelocity;
             builtinData.depthOffset = hairMasterNode.m_depthOffset;
+            builtinData.alphaToMask = hairMasterNode.m_AlphaToMask;
 
             builtinData.alphaTestShadow = hairMasterNode.m_AlphaTestShadow;
             builtinData.backThenFrontRendering = hairMasterNode.m_BackThenFrontRendering;

com.unity.render-pipelines.high-definition/Editor/Material/Lit/ShaderGraph/HDLitSubTarget.Migration.cs

@@ -131,6 +131,7 @@ void UpgradeHDLitMasterNode(HDLitMasterNode1 hdLitMasterNode, out Dictionary<Blo
             builtinData.transparentWritesMotionVec = hdLitMasterNode.m_TransparentWritesMotionVec;
             builtinData.addPrecomputedVelocity = hdLitMasterNode.m_AddPrecomputedVelocity;
             builtinData.depthOffset = hdLitMasterNode.m_depthOffset;
+            builtinData.alphaToMask = hdLitMasterNode.m_AlphaToMask;
 
             builtinData.alphaTestShadow = hdLitMasterNode.m_AlphaTestShadow;
             builtinData.backThenFrontRendering = hdLitMasterNode.m_BackThenFrontRendering;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDSubShaderUtilities.cs

@@ -144,7 +144,7 @@ public static void AddStencilShaderProperties(PropertyCollector collector, Syste
 
         public static void AddBlendingStatesShaderProperties(
             PropertyCollector collector, SurfaceType surface, BlendMode blend, int sortingPriority,
-            bool transparentZWrite, TransparentCullMode transparentCullMode,
+            bool alphaToMask, bool transparentZWrite, TransparentCullMode transparentCullMode,
             OpaqueCullMode opaqueCullMode, CompareFunction zTest,
             bool backThenFrontRendering, bool fogOnTransparent)
         {
@@ -156,6 +156,8 @@ public static void AddBlendingStatesShaderProperties(
             collector.AddFloatProperty("_DstBlend", 0.0f);
             collector.AddFloatProperty("_AlphaSrcBlend", 1.0f);
             collector.AddFloatProperty("_AlphaDstBlend", 0.0f);
+            collector.AddToggleProperty("_AlphaToMask", alphaToMask);
+            collector.AddToggleProperty("_AlphaToMaskInspectorValue", alphaToMask);
             collector.AddToggleProperty(kZWrite, (surface == SurfaceType.Transparent) ? transparentZWrite : true);
             collector.AddToggleProperty(kTransparentZWrite, transparentZWrite);
             collector.AddFloatProperty("_CullMode", (int)CullMode.Back);

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/HDTarget.cs

@@ -683,7 +683,7 @@ public static class Uniforms
             public static readonly string dstBlend = "[_DstBlend]";
             public static readonly string alphaSrcBlend = "[_AlphaSrcBlend]";
             public static readonly string alphaDstBlend = "[_AlphaDstBlend]";
-            public static readonly string alphaCutoffEnable = "[_AlphaCutoffEnable]";
+            public static readonly string alphaToMask = "[_AlphaToMask]";
             public static readonly string cullMode = "[_CullMode]";
             public static readonly string cullModeForward = "[_CullModeForward]";
             public static readonly string zTestDepthEqualForOpaque = "[_ZTestDepthEqualForOpaque]";
@@ -739,7 +739,7 @@ public static class Uniforms
         {
             { RenderState.Cull(Uniforms.cullMode) },
             { RenderState.ZWrite(ZWrite.On) },
-            { RenderState.AlphaToMask(Uniforms.alphaCutoffEnable), new FieldCondition(Fields.AlphaToMask, true) },
+            { RenderState.AlphaToMask(Uniforms.alphaToMask), new FieldCondition(Fields.AlphaToMask, true) },
             { RenderState.Stencil(new StencilDescriptor()
             {
                 WriteMask = Uniforms.stencilWriteMaskDepth,
@@ -753,7 +753,7 @@ public static class Uniforms
         {
             { RenderState.Cull(Uniforms.cullMode) },
             { RenderState.ZWrite(ZWrite.On) },
-            { RenderState.AlphaToMask(Uniforms.alphaCutoffEnable), new FieldCondition(Fields.AlphaToMask, true) },
+            { RenderState.AlphaToMask(Uniforms.alphaToMask), new FieldCondition(Fields.AlphaToMask, true) },
             { RenderState.Stencil(new StencilDescriptor()
             {
                 WriteMask = Uniforms.stencilWriteMaskMV,
@@ -1402,6 +1402,15 @@ static class CoreKeywordDescriptors
             scope = KeywordScope.Local
         };
 
+        public static KeywordDescriptor AlphaToMask = new KeywordDescriptor()
+        {
+            displayName = "Alpha To Mask",
+            referenceName = "_ALPHATOMASK_ON",
+            type = KeywordType.Boolean,
+            definition = KeywordDefinition.ShaderFeature,
+            scope = KeywordScope.Local,
+        };
+
         public static KeywordDescriptor TransparentColorShadow = new KeywordDescriptor()
         {
             displayName = "Transparent Color Shadow",

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/EyeMasterNode1.cs

@@ -124,6 +124,7 @@ public bool MaterialTypeUsesSlotMask(SlotMask mask)
         public CompareFunction m_ZTest;
         public bool m_SupportLodCrossFade;
         public bool m_DOTSInstancing;
+        public bool m_AlphaToMask;
         public int m_MaterialNeedsUpdateHash;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/FabricMasterNode1.cs

@@ -127,6 +127,7 @@ public bool MaterialTypeUsesSlotMask(SlotMask mask)
         public CompareFunction m_ZTest;
         public bool m_SupportLodCrossFade;
         public bool m_DOTSInstancing;
+        public bool m_AlphaToMask;
         public int m_MaterialNeedsUpdateHash;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/HDLitMasterNode1.cs

@@ -183,6 +183,7 @@ public bool MaterialTypeUsesSlotMask(SlotMask mask)
         public CompareFunction m_ZTest;
         public bool m_SupportLodCrossFade;
         public bool m_DOTSInstancing;
+        public bool m_AlphaToMask;
         public int m_MaterialNeedsUpdateHash;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/HDUnlitMasterNode1.cs

@@ -34,6 +34,7 @@ public enum AlphaMode
         public bool m_DistortionOnly;
         public bool m_DistortionDepthTest;
         public bool m_AlphaTest;
+        public bool m_AlphaToMask;
         public int m_SortPriority;
         public bool m_DoubleSided;
         public bool m_ZWrite;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/HairMasterNode1.cs

@@ -134,6 +134,7 @@ public bool MaterialTypeUsesSlotMask(SlotMask mask)
         public CompareFunction m_ZTest;
         public bool m_SupportLodCrossFade;
         public bool m_DOTSInstancing;
+        public bool m_AlphaToMask;
         public int m_MaterialNeedsUpdateHash;
         public string m_ShaderGUIOverride;
         public bool m_OverrideEnabled;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Legacy/StackLitMasterNode1.cs

@@ -122,6 +122,7 @@ public enum SpecularOcclusionConeFixupMethod
         public DistortionMode m_DistortionMode;
         public bool m_DistortionDepthTest;
         public bool m_AlphaTest;
+        public bool m_AlphaToMask;
         public int m_SortPriority;
         public DoubleSidedMode m_DoubleSidedMode;
         public NormalDropOffSpace m_NormalDropOffSpace;

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceOptionPropertyBlock.cs

@@ -91,11 +91,13 @@ protected override void CreatePropertyGUI()
             context.globalIndentLevel--;
 
             // Alpha Test
+            // TODO: AlphaTest is in SystemData but Alpha to Mask is in BuiltinData?
             AddProperty(alphaCutoffEnableText, () => systemData.alphaTest, (newValue) => systemData.alphaTest = newValue);
             if (systemData.alphaTest)
             {
                 context.globalIndentLevel++;
                 AddProperty(useShadowThresholdText, () => builtinData.alphaTestShadow, (newValue) => builtinData.alphaTestShadow = newValue);
+                AddProperty(alphaToMaskText, () => builtinData.alphaToMask, (newValue) => builtinData.alphaToMask = newValue);
                 context.globalIndentLevel--;
             }
 

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/SurfaceSubTarget.cs

@@ -148,7 +148,10 @@ protected override void CollectPassKeywords(ref PassDescriptor pass)
             pass.keywords.Add(CoreKeywordDescriptors.AlphaTest, new FieldCondition(Fields.AlphaTest, true));
 
             if (pass.IsDepthOrMV())
+            {
+                pass.keywords.Add(CoreKeywordDescriptors.AlphaToMask, new FieldCondition(Fields.AlphaToMask, true));
                 pass.keywords.Add(CoreKeywordDescriptors.WriteMsaaDepth);
+            }
 
             pass.keywords.Add(CoreKeywordDescriptors.SurfaceTypeTransparent);
             pass.keywords.Add(CoreKeywordDescriptors.BlendMode);
@@ -366,6 +369,7 @@ public override void CollectShaderProperties(PropertyCollector collector, Genera
                 systemData.surfaceType,
                 systemData.blendMode,
                 systemData.sortPriority,
+                builtinData.alphaToMask,
                 systemData.transparentZWrite,
                 systemData.transparentCullMode,
                 systemData.opaqueCullMode,

com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/TargetData/BuiltinData.cs

@@ -46,6 +46,14 @@ public bool transparentWritesMotionVec
             set => m_TransparentWritesMotionVec = value;
         }
 
+        [SerializeField]
+        bool m_AlphaToMask = false;
+        public bool alphaToMask
+        {
+            get => m_AlphaToMask;
+            set => m_AlphaToMask = value;
+        }
+
         [SerializeField]
         bool m_DepthOffset;
         public bool depthOffset

com.unity.render-pipelines.high-definition/Editor/Material/StackLit/ShaderGraph/StackLitSubTarget.Migration.cs

@@ -44,6 +44,7 @@ public bool TryUpgradeFromMasterNode(IMasterNode1 masterNode, out Dictionary<Blo
             builtinData.distortionDepthTest = stackLitMasterNode.m_DistortionDepthTest;
             builtinData.addPrecomputedVelocity = stackLitMasterNode.m_AddPrecomputedVelocity;
             builtinData.depthOffset = stackLitMasterNode.m_depthOffset;
+            builtinData.alphaToMask = stackLitMasterNode.m_AlphaToMask;
 
             lightingData.normalDropOffSpace = stackLitMasterNode.m_NormalDropOffSpace;
             lightingData.blendPreserveSpecular = stackLitMasterNode.m_BlendPreserveSpecular;