Fixed Subpass enum shader keyword does not match actual shader keyword.

Author: thomas-zeng

Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Nodes/FetchSceneDepthNode.cs

@@ -94,7 +94,7 @@ static string Unity_FetchSceneDepth_Linear01(
             return
 @"
 {
-    #if defined(DEPTH_AS_INPUT_ATTACHMENT) || defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)
+    #if defined(_DEPTH_AS_INPUT_ATTACHMENT) || defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)
         // Fetch depth from tile memory using input attachment
         float rawDepth = shadergraph_LWFetchSceneDepth(clipPos.xy);
         Out = Linear01Depth(rawDepth, _ZBufferParams);
@@ -113,7 +113,7 @@ static string Unity_FetchSceneDepth_Raw(
             return
 @"
 {
-    #if defined(DEPTH_AS_INPUT_ATTACHMENT) || defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)
+    #if defined(_DEPTH_AS_INPUT_ATTACHMENT) || defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)
         // Fetch raw depth from tile memory using input attachment
         Out = shadergraph_LWFetchSceneDepth(clipPos.xy);
     #else
@@ -131,7 +131,7 @@ static string Unity_FetchSceneDepth_Eye(
             return
 @"
 {
-    #if defined(DEPTH_AS_INPUT_ATTACHMENT) || defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)
+    #if defined(_DEPTH_AS_INPUT_ATTACHMENT) || defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)
         // Fetch depth from tile memory using input attachment
         float rawDepth = shadergraph_LWFetchSceneDepth(clipPos.xy);
         {

Packages/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs

@@ -1480,10 +1480,10 @@ public static class ShaderKeywordStrings
         public const string Msaa4 = "_MSAA_4";
 
         /// <summary> Keyword used for depth as input attachment. </summary>
-        public const string DEPTH_AS_INPUT_ATTACHMENT = "DEPTH_AS_INPUT_ATTACHMENT";
+        public const string DEPTH_AS_INPUT_ATTACHMENT = "_DEPTH_AS_INPUT_ATTACHMENT";
 
         /// <summary> Keyword used for depth as input attachment MSAA. </summary>
-        public const string DEPTH_AS_INPUT_ATTACHMENT_MSAA = "DEPTH_AS_INPUT_ATTACHMENT_MSAA";
+        public const string DEPTH_AS_INPUT_ATTACHMENT_MSAA = "_DEPTH_AS_INPUT_ATTACHMENT_MSAA";
     }
 
     public sealed partial class UniversalRenderPipeline

Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareDepthTexture.hlsl

@@ -10,15 +10,15 @@ float4 _CameraDepthTexture_TexelSize;
 #define sampler_CameraDepthTexture sampler_PointClamp
 
 // Framebuffer fetch API for depth input attachment
-#if defined(DEPTH_AS_INPUT_ATTACHMENT)
+#if defined(_DEPTH_AS_INPUT_ATTACHMENT)
     FRAMEBUFFER_INPUT_X_FLOAT(0);
 
     float FetchSceneDepth(float2 fragCoord)
     {
         float depth = LOAD_FRAMEBUFFER_INPUT_X(0, fragCoord).r;
         return depth; 
     }
-#elif defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)
+#elif defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)
     FRAMEBUFFER_INPUT_X_FLOAT_MS(0);
 
     float FetchSceneDepth(float2 fragCoord, int sampleIndx) 

Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl

@@ -35,7 +35,7 @@ float shadergraph_LWSampleSceneDepth(float2 uv)
 #endif
 }
 
-#if defined(DEPTH_AS_INPUT_ATTACHMENT)
+#if defined(_DEPTH_AS_INPUT_ATTACHMENT)
     float shadergraph_LWFetchSceneDepth(float2 fragCoord)
     {
         #if defined(REQUIRE_DEPTH_TEXTURE)
@@ -44,7 +44,7 @@ float shadergraph_LWSampleSceneDepth(float2 uv)
             return 0;
         #endif
     }
-#elif defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)
+#elif defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)
     float shadergraph_LWFetchSceneDepth(float2 fragCoord)
     {
     #if defined(REQUIRE_DEPTH_TEXTURE)

Tests/SRPTests/Projects/UniversalGraphicsTest_Foundation/Assets/Scenes/365_RenderObject_DepthInputAttachment/CustomFetchDepth.shader

@@ -20,7 +20,7 @@ Shader "CustomFetchDepth"
             #pragma vertex Vert
             #pragma fragment FragDepthVisualization
             #pragma target 4.5
-            #pragma multi_compile _ DEPTH_AS_INPUT_ATTACHMENT DEPTH_AS_INPUT_ATTACHMENT_MSAA
+            #pragma multi_compile _ _DEPTH_AS_INPUT_ATTACHMENT _DEPTH_AS_INPUT_ATTACHMENT_MSAA
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
             #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareDepthTexture.hlsl"
 
@@ -47,15 +47,15 @@ Shader "CustomFetchDepth"
                 return output;
             }
 
-#if defined(DEPTH_AS_INPUT_ATTACHMENT)
+#if defined(_DEPTH_AS_INPUT_ATTACHMENT)
             float4 FragDepthVisualization(Varyings input) : SV_Target0
             {
                 UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
 
                 float depth = FetchSceneDepth(input.positionCS.xy);
                 return float4(depth, 0.0f, 0.0f, 1.0);
             }
-#elif defined(DEPTH_AS_INPUT_ATTACHMENT_MSAA)    
+#elif defined(_DEPTH_AS_INPUT_ATTACHMENT_MSAA)    
             float4 FragDepthVisualization(Varyings input) : SV_Target0
             {
                 UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);