[UUM-59543] Fix Light2D shader warnings

Fix shader warnings in URP 2D template

Author: kennytann

Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawRenderer2DPass.cs

@@ -153,10 +153,8 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                         builder.UseTexture(passData.lightTextures[i]);
                 }
 
-                AccessFlags accessFlags = SystemInfo.graphicsDeviceType == GraphicsDeviceType.Metal ? AccessFlags.Write: AccessFlags.Read;
-
                 builder.SetRenderAttachment(commonResourceData.activeColorTexture, 0);
-                builder.SetRenderAttachmentDepth(commonResourceData.activeDepthTexture, accessFlags);
+                builder.SetRenderAttachmentDepth(commonResourceData.activeDepthTexture);
                 builder.AllowPassCulling(false);
                 builder.AllowGlobalStateModification(true);
                 builder.UseAllGlobalTextures(true);

Packages/com.unity.render-pipelines.universal/Runtime/2D/Rendergraph/DrawShadow2DPass.cs

@@ -61,13 +61,16 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                 passData.isVolumetric = isVolumetric;
                 passData.shadowMap = shadowTexture;
                 passData.shadowDepth = depthTexture;
-                passData.depthTexture = !isVolumetric ? universal2DResourceData.intermediateDepth : commonResourceData.activeDepthTexture;
                 passData.normalMap = layerBatch.lightStats.useNormalMap ? universal2DResourceData.normalsTexture[batchIndex] : TextureHandle.nullHandle;
                 passData.fallOffLookUp = graph.ImportTexture(DrawLight2DPass.m_FallOffRTHandle);
                 passData.lightLookUp = graph.ImportTexture(DrawLight2DPass.m_LightLookupRTHandle);
 
                 if (!isVolumetric)
+                {
                     passData.lightTextures = universal2DResourceData.lightTextures[batchIndex];
+                    passData.depthTexture = universal2DResourceData.intermediateDepth;
+                    builder.UseTexture(passData.depthTexture, AccessFlags.Write);
+                }
                 else
                 {
                     intermediateTexture[0] = commonResourceData.activeColorTexture;
@@ -85,7 +88,6 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
 
                 builder.UseTexture(shadowTexture, AccessFlags.Write);
                 builder.UseTexture(depthTexture, AccessFlags.Write);
-                builder.UseTexture(passData.depthTexture, AccessFlags.Write);
                 builder.UseTexture(passData.fallOffLookUp);
                 builder.UseTexture(passData.lightLookUp);
 
@@ -122,7 +124,7 @@ public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData
                             cmd.SetRenderTarget(data.lightTexturesRT, data.depthTexture);
                         }
                         else
-                            cmd.SetRenderTarget(data.lightTextures[0], data.depthTexture);
+                            cmd.SetRenderTarget(data.lightTextures[0]);
 
                         // Light Pass
                         using (new ProfilingScope(cmd, DrawLight2DPass.m_ProfilingSamplerLowLevel))

Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl

@@ -78,18 +78,31 @@
     half4 _ShapeLightMaskFilter##index;\
     half4 _ShapeLightInvertedFilter##index;
 
+#if !defined(USE_SHAPE_LIGHT_TYPE_0) && !defined(USE_SHAPE_LIGHT_TYPE_1) && !defined(USE_SHAPE_LIGHT_TYPE_2) && !defined(USE_SHAPE_LIGHT_TYPE_3)
+#define USE_DEFAULT_LIGHT_TYPE 1
+#endif
+
 struct FragmentOutput
 {
-    half4 GLightBuffer0 : SV_Target0;
+#if USE_SHAPE_LIGHT_TYPE_0 || USE_DEFAULT_LIGHT_TYPE
+   half4 GLightBuffer0 : SV_Target0;
+#endif
+#if USE_SHAPE_LIGHT_TYPE_1
     half4 GLightBuffer1 : SV_Target1;
+#endif
+#if USE_SHAPE_LIGHT_TYPE_2
     half4 GLightBuffer2 : SV_Target2;
+#endif
+#if USE_SHAPE_LIGHT_TYPE_3
     half4 GLightBuffer3 : SV_Target3;
+#endif
 };
 
 FragmentOutput ToFragmentOutput(half4 finalColor)
 {
     FragmentOutput output;
-    #if USE_SHAPE_LIGHT_TYPE_0
+
+    #if USE_SHAPE_LIGHT_TYPE_0 || USE_DEFAULT_LIGHT_TYPE
     output.GLightBuffer0 = finalColor;
     #endif
     #if USE_SHAPE_LIGHT_TYPE_1
@@ -101,9 +114,7 @@ FragmentOutput ToFragmentOutput(half4 finalColor)
     #if USE_SHAPE_LIGHT_TYPE_3
     output.GLightBuffer3 = finalColor;
     #endif
-    #if !defined(USE_SHAPE_LIGHT_TYPE_0) && !defined(USE_SHAPE_LIGHT_TYPE_1) && !defined(USE_SHAPE_LIGHT_TYPE_2) && !defined(USE_SHAPE_LIGHT_TYPE_3)
-    output.GLightBuffer0 = finalColor;
-    #endif
+
     return output;
 }
 

Packages/com.unity.render-pipelines.universal/Shaders/2D/Light2D.shader

@@ -218,7 +218,7 @@ Shader "Hidden/Light2D"
                 return ToFragmentOutput(lightColor * _InverseHDREmulationScale);
             }
 
-            FragmentOutput frag(Varyings i) : SV_Target
+            FragmentOutput frag(Varyings i)
             {
 
                 PerLight2D light;