[6000][UUM-72414][UUM-72180] Fix blend issues in rendergraph pipeline

Fix UUM-72414 and UUM-72180

Author: kennytann

Packages/com.unity.render-pipelines.universal/Runtime/2D/Passes/Render2DLightingPass.cs

@@ -180,7 +180,6 @@ private int DrawLayerBatches(
             var rtCount = 0U;
 
             // Account for Sprite Mask and normal map usage where the first and last layer has to render the stencil pass
-            bool hasSpriteMask = UnityEngine.SpriteMaskUtility.HasSpriteMaskInScene();
             bool normalsFirstClear = true;
 
             // Draw lights
@@ -205,9 +204,7 @@ private int DrawLayerBatches(
 
                     batchesDrawn++;
 
-                    if (layerBatch.lightStats.totalNormalMapUsage > 0 ||
-                        (hasSpriteMask && i == 0) ||
-                        (hasSpriteMask && i + 1 == batchCount))
+                    if (layerBatch.lightStats.totalNormalMapUsage > 0)
                     {
                         filterSettings.sortingLayerRange = layerBatch.layerRange;
                         var depthTarget = m_NeedsDepth ? depthAttachmentHandle : null;

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

@@ -30,13 +30,10 @@ private static void Execute(RasterCommandBuffer cmd, PassData passData)
         public void Render(RenderGraph graph, ContextContainer frameData, Renderer2DData rendererData, ref LayerBatch layerBatch, int batchIndex)
         {
             Universal2DResourceData universal2DResourceData = frameData.Get<Universal2DResourceData>();
-            bool hasSpriteMask = UnityEngine.SpriteMaskUtility.HasSpriteMaskInScene();
             int lastBatchIndex = universal2DResourceData.normalsTexture.Length - 1;
 
             // Account for Sprite Mask and normal map usage where the first and last layer has to render the stencil pass
-            if (!layerBatch.lightStats.useNormalMap &&
-                !(hasSpriteMask && batchIndex == 0) &&
-                !(hasSpriteMask && batchIndex == lastBatchIndex))
+            if (!layerBatch.lightStats.useNormalMap)
                 return;
 
             UniversalRenderingData renderingData = frameData.Get<UniversalRenderingData>();

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

@@ -46,8 +46,9 @@ private static void Execute(RasterGraphContext context, PassData passData)
             {
                 if (passData.layerUseLights)
                 {
-                    for (var blendStyleIndex = 0; blendStyleIndex < blendStylesCount; blendStyleIndex++)
+                    for (var i = 0; i < blendStylesCount; i++)
                     {
+                        var blendStyleIndex = passData.blendStyleIndices[i];
                         RendererLighting.EnableBlendStyle(cmd, blendStyleIndex, true);
                     }
                 }
@@ -191,9 +192,10 @@ void SetGlobalLightTextures(RenderGraph graph, IRasterRenderGraphBuilder builder
             {
                 if (layerBatch.lightStats.useAnyLights)
                 {
-                    for (var blendStyleIndex = 0; blendStyleIndex < lightTextures.Length; blendStyleIndex++)
+                    for (var i = 0; i < lightTextures.Length; i++)
                     {
-                        builder.SetGlobalTextureAfterPass(lightTextures[blendStyleIndex], Shader.PropertyToID(RendererLighting.k_ShapeLightTextureIDs[blendStyleIndex]));
+                        var blendStyleIndex = layerBatch.activeBlendStylesIndices[i];
+                        builder.SetGlobalTextureAfterPass(lightTextures[i], Shader.PropertyToID(RendererLighting.k_ShapeLightTextureIDs[blendStyleIndex]));
                     }
                 }
                 else if (rendererData.lightCullResult.IsSceneLit())

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

@@ -267,7 +267,7 @@ void CreateResources(RenderGraph renderGraph)
                         if (!Light2DManager.GetGlobalColor(m_LayerBatches[i].startLayerID, index, out var clearColor))
                             clearColor = Color.black;
 
-                        universal2DResourceData.lightTextures[i][j] = UniversalRenderer.CreateRenderGraphTexture(renderGraph, desc, RendererLighting.k_ShapeLightTextureIDs[j], true, clearColor, FilterMode.Bilinear);
+                        universal2DResourceData.lightTextures[i][j] = UniversalRenderer.CreateRenderGraphTexture(renderGraph, desc, RendererLighting.k_ShapeLightTextureIDs[index], true, clearColor, FilterMode.Bilinear);
                     }
                 }
             }