[Universal] RenderPass merging

com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs

@@ -56,8 +56,6 @@ public ShadowResolutionRequest(int _visibleLightIndex, int _perLightShadowSliceI
         private RenderTargetHandle m_AdditionalLightsShadowmap;
         internal RenderTexture m_AdditionalLightsShadowmapTexture;
 
-        int m_ShadowmapWidth;
-        int m_ShadowmapHeight;
 
         float m_MaxShadowDistanceSq;
         float m_CascadeBorder;
@@ -479,8 +477,8 @@ public bool Setup(ref RenderingData renderingData)
 
             Clear();
 
-            m_ShadowmapWidth = renderingData.shadowData.additionalLightsShadowmapWidth;
-            m_ShadowmapHeight = renderingData.shadowData.additionalLightsShadowmapHeight;
+            renderTargetWidth = renderingData.shadowData.additionalLightsShadowmapWidth;
+            renderTargetHeight = renderingData.shadowData.additionalLightsShadowmapHeight;
 
             var visibleLights = renderingData.lightData.visibleLights;
             int additionalLightsCount = renderingData.lightData.additionalLightsCount;
@@ -747,11 +745,12 @@ public bool Setup(ref RenderingData renderingData)
                 atlasMaxY = Mathf.Max(atlasMaxY, shadowResolutionRequest.offsetY + shadowResolutionRequest.allocatedResolution);
             }
             // ...but make sure we still use power-of-two dimensions (might perform better on some hardware)
-            m_ShadowmapWidth = Mathf.NextPowerOfTwo(atlasMaxX);
-            m_ShadowmapHeight = Mathf.NextPowerOfTwo(atlasMaxY);
 
-            float oneOverAtlasWidth = 1.0f / m_ShadowmapWidth;
-            float oneOverAtlasHeight = 1.0f / m_ShadowmapHeight;
+            renderTargetWidth = Mathf.NextPowerOfTwo(atlasMaxX);
+            renderTargetHeight = Mathf.NextPowerOfTwo(atlasMaxY);
+
+            float oneOverAtlasWidth = 1.0f / renderTargetWidth;
+            float oneOverAtlasHeight = 1.0f / renderTargetHeight;
 
             Matrix4x4 sliceTransform;
             for (int globalShadowSliceIndex = 0; globalShadowSliceIndex < shadowCastingLightsBufferCount; ++globalShadowSliceIndex)
@@ -784,7 +783,7 @@ public bool Setup(ref RenderingData renderingData)
                 m_AdditionalLightShadowSliceIndexTo_WorldShadowMatrix[globalShadowSliceIndex] = sliceTransform * m_AdditionalLightShadowSliceIndexTo_WorldShadowMatrix[globalShadowSliceIndex];
             }
 
-            m_AdditionalLightsShadowmapTexture = ShadowUtils.GetTemporaryShadowTexture(m_ShadowmapWidth, m_ShadowmapHeight, k_ShadowmapBufferBits);
+            m_AdditionalLightsShadowmapTexture = ShadowUtils.GetTemporaryShadowTexture(renderTargetWidth, renderTargetHeight, k_ShadowmapBufferBits);
             m_MaxShadowDistanceSq = renderingData.cameraData.maxShadowDistance * renderingData.cameraData.maxShadowDistance;
             m_CascadeBorder = renderingData.shadowData.mainLightShadowCascadeBorder;
 
@@ -793,7 +792,7 @@ public bool Setup(ref RenderingData renderingData)
 
         public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
         {
-            ConfigureTarget(new RenderTargetIdentifier(m_AdditionalLightsShadowmapTexture), GraphicsFormat.ShadowAuto, m_ShadowmapWidth, m_ShadowmapHeight, 1, true);
+            ConfigureTarget(new RenderTargetIdentifier(m_AdditionalLightsShadowmapTexture), GraphicsFormat.ShadowAuto, renderTargetWidth, renderTargetHeight, 1, true);
             ConfigureClear(ClearFlag.All, Color.black);
         }
 

com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs

@@ -28,8 +28,6 @@ private static class MainLightShadowConstantBuffer
         const int k_ShadowmapBufferBits = 16;
         float m_CascadeBorder;
         float m_MaxShadowDistanceSq;
-        int m_ShadowmapWidth;
-        int m_ShadowmapHeight;
         int m_ShadowCasterCascadesCount;
         bool m_SupportsBoxFilterForShadows;
 
@@ -98,22 +96,22 @@ public bool Setup(ref RenderingData renderingData)
 
             int shadowResolution = ShadowUtils.GetMaxTileResolutionInAtlas(renderingData.shadowData.mainLightShadowmapWidth,
                 renderingData.shadowData.mainLightShadowmapHeight, m_ShadowCasterCascadesCount);
-            m_ShadowmapWidth = renderingData.shadowData.mainLightShadowmapWidth;
-            m_ShadowmapHeight = (m_ShadowCasterCascadesCount == 2) ?
+            renderTargetWidth = renderingData.shadowData.mainLightShadowmapWidth;
+            renderTargetHeight = (m_ShadowCasterCascadesCount == 2) ?
                 renderingData.shadowData.mainLightShadowmapHeight >> 1 :
                 renderingData.shadowData.mainLightShadowmapHeight;
 
             for (int cascadeIndex = 0; cascadeIndex < m_ShadowCasterCascadesCount; ++cascadeIndex)
             {
                 bool success = ShadowUtils.ExtractDirectionalLightMatrix(ref renderingData.cullResults, ref renderingData.shadowData,
-                    shadowLightIndex, cascadeIndex, m_ShadowmapWidth, m_ShadowmapHeight, shadowResolution, light.shadowNearPlane,
+                    shadowLightIndex, cascadeIndex, renderTargetWidth, renderTargetHeight, shadowResolution, light.shadowNearPlane,
                     out m_CascadeSplitDistances[cascadeIndex], out m_CascadeSlices[cascadeIndex]);
 
                 if (!success)
                     return false;
             }
 
-            m_MainLightShadowmapTexture = ShadowUtils.GetTemporaryShadowTexture(m_ShadowmapWidth, m_ShadowmapHeight, k_ShadowmapBufferBits);
+            m_MainLightShadowmapTexture = ShadowUtils.GetTemporaryShadowTexture(renderTargetWidth, renderTargetHeight, k_ShadowmapBufferBits);
             m_MaxShadowDistanceSq = renderingData.cameraData.maxShadowDistance * renderingData.cameraData.maxShadowDistance;
             m_CascadeBorder = renderingData.shadowData.mainLightShadowCascadeBorder;
 
@@ -122,7 +120,7 @@ public bool Setup(ref RenderingData renderingData)
 
         public override void Configure(CommandBuffer cmd, RenderTextureDescriptor cameraTextureDescriptor)
         {
-            ConfigureTarget(new RenderTargetIdentifier(m_MainLightShadowmapTexture), GraphicsFormat.ShadowAuto, m_ShadowmapWidth, m_ShadowmapHeight, 1, true);
+            ConfigureTarget(new RenderTargetIdentifier(m_MainLightShadowmapTexture), GraphicsFormat.ShadowAuto, renderTargetWidth, renderTargetHeight, 1, true);
             ConfigureClear(ClearFlag.All, Color.black);
         }
 
@@ -215,8 +213,8 @@ void SetupMainLightShadowReceiverConstants(CommandBuffer cmd, VisibleLight shado
             for (int i = cascadeCount; i <= k_MaxCascades; ++i)
                 m_MainLightShadowMatrices[i] = noOpShadowMatrix;
 
-            float invShadowAtlasWidth = 1.0f / m_ShadowmapWidth;
-            float invShadowAtlasHeight = 1.0f / m_ShadowmapHeight;
+            float invShadowAtlasWidth = 1.0f / renderTargetWidth;
+            float invShadowAtlasHeight = 1.0f / renderTargetHeight;
             float invHalfShadowAtlasWidth = 0.5f * invShadowAtlasWidth;
             float invHalfShadowAtlasHeight = 0.5f * invShadowAtlasHeight;
             float softShadowsProp = softShadows ? 1.0f : 0.0f;
@@ -267,7 +265,7 @@ void SetupMainLightShadowReceiverConstants(CommandBuffer cmd, VisibleLight shado
                 // enough so custom shaders might use it.
                 cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowmapSize, new Vector4(invShadowAtlasWidth,
                     invShadowAtlasHeight,
-                    m_ShadowmapWidth, m_ShadowmapHeight));
+                    renderTargetWidth, renderTargetHeight));
             }
         }
     };

com.unity.render-pipelines.universal/Runtime/Passes/ScriptableRenderPass.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Unity.Collections;
 using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.Experimental.Rendering;
 
@@ -201,7 +202,10 @@ public Color clearColor
         internal bool depthOnly { get; set; }
         // this flag is updated each frame to keep track of which pass is the last for the current camera
         internal bool isLastPass { get; set; }
+        // index to track the position in the current frame
+        internal int renderPassQueueIndex { get; set; }
 
+        internal NativeArray<int> m_InputAttachmentIndices;
 
         internal GraphicsFormat[] renderTargetFormat { get; set; }
         RenderTargetIdentifier[] m_ColorAttachments = new RenderTargetIdentifier[] {BuiltinRenderTextureType.CameraTarget};
@@ -228,6 +232,7 @@ public ScriptableRenderPass()
             renderTargetWidth = -1;
             renderTargetHeight = -1;
             renderTargetSampleCount = -1;
+            renderPassQueueIndex = -1;
             renderTargetFormat = new GraphicsFormat[]
             {
                 GraphicsFormat.None, GraphicsFormat.None, GraphicsFormat.None,

com.unity.render-pipelines.universal/Runtime/RendererFeatures/RenderObjects.cs

@@ -92,5 +92,10 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD
         {
             renderer.EnqueuePass(renderObjectsPass);
         }
+
+        internal override bool SupportsNativeRenderPass()
+        {
+            return true;
+        }
     }
 }

com.unity.render-pipelines.universal/Runtime/RenderingUtils.cs

@@ -349,20 +349,6 @@ internal static uint GetValidColorBufferCount(RenderTargetIdentifier[] colorBuff
             return nonNullColorBuffers;
         }
 
-        internal static uint GetValidColorAttachmentCount(AttachmentDescriptor[] colorAttachments)
-        {
-            uint nonNullColorBuffers = 0;
-            if (colorAttachments != null)
-            {
-                foreach (var attachment in colorAttachments)
-                {
-                    if (attachment != RenderingUtils.emptyAttachment)
-                        ++nonNullColorBuffers;
-                }
-            }
-            return nonNullColorBuffers;
-        }
-
         /// <summary>
         /// Return true if colorBuffers is an actual MRT setup
         /// </summary>