Internal/6000.3/staging

Internal/6000.3/staging

Author: claire-nicholson

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs

@@ -361,6 +361,7 @@ void BakingGUI()
                 activeSet = newSet;
 
                 ProbeReferenceVolume.instance.Clear();
+                ProbeReferenceVolume.instance.SetActiveBakingSet(newSet);
             }
 
             if (activeSet != null)

Packages/com.unity.render-pipelines.core/Runtime/GPUDriven/InstanceCuller.cs

@@ -2614,6 +2614,7 @@ private void OnEndSceneViewCameraRendering()
 
         public void UpdateFrame(int cameraCount)
         {
+            DisposeSceneViewHiddenBits();
             DisposeCompactVisibilityMasks();
             if (cameraCount > m_LODParamsToCameraID.Capacity)
                 m_LODParamsToCameraID.Capacity = cameraCount;

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolume.hlsl

@@ -77,7 +77,13 @@ struct APVResources
 
 struct APVResourcesRW
 {
+#ifdef SHADER_API_METAL
+    // We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+    // See https://jira.unity3d.com/browse/UUM-127198
+    RWTexture3D<float4> L0_L1Rx;
+#else
     RWTexture3D<half4> L0_L1Rx;
+#endif
     RWTexture3D<unorm float4> L1G_L1Ry;
     RWTexture3D<unorm float4> L1B_L1Rz;
     RWTexture3D<unorm float4> L2_0;

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute

@@ -15,7 +15,13 @@ Texture3D<float4> _State1_L0_L1Rx;
 Texture3D<float4> _State1_L1G_L1Ry;
 Texture3D<float4> _State1_L1B_L1Rz;
 
+#ifdef SHADER_API_METAL
+// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+// See https://jira.unity3d.com/browse/UUM-127198
+RWTexture3D<float4> _Out_L0_L1Rx;
+#else
 RWTexture3D<half4> _Out_L0_L1Rx;
+#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 

Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute

@@ -9,7 +9,13 @@
 #pragma multi_compile_local _ PROBE_VOLUMES_SKY_SHADING_DIRECTION
 #pragma multi_compile_local _ PROBE_VOLUMES_PROBE_OCCLUSION
 
+#ifdef SHADER_API_METAL
+// We need to use float4 on Metal, since HLSLcc will generate invalid MSL otherwise.
+// See https://jira.unity3d.com/browse/UUM-127198
+RWTexture3D<float4> _Out_L0_L1Rx;
+#else
 RWTexture3D<half4> _Out_L0_L1Rx;
+#endif
 RWTexture3D<unorm float4> _Out_L1G_L1Ry;
 RWTexture3D<unorm float4> _Out_L1B_L1Rz;
 

Packages/com.unity.render-pipelines.core/Runtime/PostProcessing/LensFlareComponentSRP.cs

@@ -13,6 +13,7 @@ namespace UnityEngine.Rendering
     /// </summary>
     [ExecuteAlways]
     [AddComponentMenu("Rendering/Lens Flare (SRP)")]
+    [CurrentPipelineHelpURL("shared/lens-flare/lens-flare-component")]
     public sealed class LensFlareComponentSRP : MonoBehaviour
     {
         [SerializeField]

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/NativePassCompiler.cs

@@ -1076,7 +1076,7 @@ void DetectMemoryLessResources()
                 foreach (ref readonly var nativePass in contextData.NativePasses)
                 {
                     // Loop over all created resources by this nrp
-                    var graphPasses = nativePass.GraphPasses(contextData);
+                    var graphPasses = nativePass.GraphPasses(contextData, out var actualPasses);
                     foreach (ref readonly var subPass in graphPasses)
                     {
                         foreach (ref readonly var createdRes in subPass.FirstUsedResources(contextData))
@@ -1118,6 +1118,8 @@ void DetectMemoryLessResources()
                             }
                         }
                     }
+                    if (actualPasses.IsCreated)
+                        actualPasses.Dispose();
                 }
             }
         }
@@ -1168,7 +1170,8 @@ private bool ExecuteInitializeResource(InternalRenderGraphContext rgContext, Ren
                     if (pass.mergeState == PassMergeState.Begin || pass.mergeState == PassMergeState.None)
                     {
                         ref var nativePass = ref contextData.nativePassData.ElementAt(pass.nativePassIndex);
-                        foreach (ref readonly var subPass in nativePass.GraphPasses(contextData))
+                        var graphPasses = nativePass.GraphPasses(contextData, out var actualPasses);
+                        foreach (ref readonly var subPass in graphPasses)
                         {
                             foreach (ref readonly var res in subPass.FirstUsedResources(contextData))
                             {
@@ -1204,6 +1207,8 @@ private bool ExecuteInitializeResource(InternalRenderGraphContext rgContext, Ren
                                 }
                             }
                         }
+                        if (actualPasses.IsCreated)
+                            actualPasses.Dispose();
                     }
                 }
                 // Other passes just create them at the beginning of the individual pass
@@ -1689,28 +1694,24 @@ internal unsafe void ExecuteBeginRenderPass(InternalRenderGraphContext rgContext
                     currBeginAttachment = new AttachmentDescriptor(renderTargetInfo.format);
 
                     // Set up the RT pointers
-                    if (attachments[i].memoryless == false)
+                    var rtHandle = resources.GetTexture(currAttachmentHandle.index);
+
+                    //HACK: Always set the loadstore target even if StoreAction == DontCare or Resolve
+                    //and LoadAction == Clear or DontCare
+                    //in these cases you could argue setting the loadStoreTarget to NULL and only set the resolveTarget
+                    //but this confuses the backend (on vulkan) and in general is not how the lower level APIs tend to work.
+                    //because of the RenderTexture duality where we always bundle store+resolve targets as one RTex
+                    //it does become impossible to have a memoryless loadStore texture with a memoryfull resolve
+                    //but that is why we mark this as a hack and future work to fix.
+                    //The proper (and planned) solution would be to move away from the render texture duality.
+                    RenderTargetIdentifier rtidAllSlices = rtHandle;
+                    currBeginAttachment.loadStoreTarget = new RenderTargetIdentifier(rtidAllSlices, attachments[i].mipLevel, CubemapFace.Unknown, attachments[i].depthSlice);
+
+                    if (attachments[i].storeAction == RenderBufferStoreAction.Resolve ||
+                        attachments[i].storeAction == RenderBufferStoreAction.StoreAndResolve)
                     {
-                        var rtHandle = resources.GetTexture(currAttachmentHandle.index);
-
-                        //HACK: Always set the loadstore target even if StoreAction == DontCare or Resolve
-                        //and LoadAction == Clear or DontCare
-                        //in these cases you could argue setting the loadStoreTarget to NULL and only set the resolveTarget
-                        //but this confuses the backend (on vulkan) and in general is not how the lower level APIs tend to work.
-                        //because of the RenderTexture duality where we always bundle store+resolve targets as one RTex
-                        //it does become impossible to have a memoryless loadStore texture with a memoryfull resolve
-                        //but that is why we mark this as a hack and future work to fix.
-                        //The proper (and planned) solution would be to move away from the render texture duality.
-                        RenderTargetIdentifier rtidAllSlices = rtHandle;
-                        currBeginAttachment.loadStoreTarget = new RenderTargetIdentifier(rtidAllSlices, attachments[i].mipLevel, CubemapFace.Unknown, attachments[i].depthSlice);
-
-                        if (attachments[i].storeAction == RenderBufferStoreAction.Resolve ||
-                            attachments[i].storeAction == RenderBufferStoreAction.StoreAndResolve)
-                        {
-                            currBeginAttachment.resolveTarget = rtHandle;
-                        }
+                        currBeginAttachment.resolveTarget = rtHandle;
                     }
-                    // In the memoryless case it's valid to not set both loadStoreTarget/and resolveTarget as the backend will allocate a transient one
 
                     currBeginAttachment.loadAction = attachments[i].loadAction;
                     currBeginAttachment.storeAction = attachments[i].storeAction;
@@ -1830,7 +1831,8 @@ private void ExecuteDestroyResource(InternalRenderGraphContext rgContext, Render
                     if (pass.mergeState == PassMergeState.End || pass.mergeState == PassMergeState.None)
                     {
                         ref var nativePass = ref contextData.nativePassData.ElementAt(pass.nativePassIndex);
-                        foreach (ref readonly var subPass in nativePass.GraphPasses(contextData))
+                        var graphPasses = nativePass.GraphPasses(contextData, out var actualPasses);
+                        foreach (ref readonly var subPass in graphPasses)
                         {
                             foreach (ref readonly var res in subPass.LastUsedResources(contextData))
                             {
@@ -1841,6 +1843,8 @@ private void ExecuteDestroyResource(InternalRenderGraphContext rgContext, Render
                                 }
                             }
                         }
+                        if (actualPasses.IsCreated)
+                            actualPasses.Dispose();
                     }
                 }
                 else

Packages/com.unity.render-pipelines.core/Runtime/RenderGraph/Compiler/PassesData.cs

@@ -781,15 +781,16 @@ public readonly bool IsValid()
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public readonly ReadOnlySpan<PassData> GraphPasses(CompilerContextData ctx)
+        public readonly ReadOnlySpan<PassData> GraphPasses(CompilerContextData ctx, out NativeArray<PassData> actualPasses)
         {
             // When there's no pass being culled, we can directly return a Span of the Native List
             if (lastGraphPass - firstGraphPass + 1 == numGraphPasses)
             {
+                actualPasses = default;
                 return ctx.passData.MakeReadOnlySpan(firstGraphPass, numGraphPasses);
             }
 
-            var actualPasses =
+            actualPasses =
                 new NativeArray<PassData>(numGraphPasses, Allocator.Temp,
                     NativeArrayOptions.UninitializedMemory);
 
@@ -808,10 +809,14 @@ public readonly ReadOnlySpan<PassData> GraphPasses(CompilerContextData ctx)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public readonly void GetGraphPassNames(CompilerContextData ctx, DynamicArray<Name> dest)
         {
-            foreach (ref readonly var pass in GraphPasses(ctx))
+            var span = GraphPasses(ctx, out var actualPasses);
+            foreach (ref readonly var pass in span)
             {
                 dest.Add(pass.GetName(ctx));
             }
+
+            if (actualPasses.IsCreated)
+                actualPasses.Dispose();
         }
 
         static bool CanMergeMSAASamples(ref NativePassData nativePass, ref PassData passToMerge)
@@ -953,7 +958,7 @@ public static PassBreakAudit CanMerge(CompilerContextData contextData, int activ
                 // Temporary cache of sampled textures in current Native Render Pass for conflict detection against fragments
                 using (HashSetPool<int>.Get(out var tempSampledTextures))
                 {
-                    var graphPasses = nativePass.GraphPasses(contextData);
+                    var graphPasses = nativePass.GraphPasses(contextData, out var actualPasses);
                     foreach (ref readonly var graphPass in graphPasses)
                     {
                         if (graphPass.numSampledOnlyRaster > 0) // Skip passes with no sampled textures
@@ -965,6 +970,9 @@ public static PassBreakAudit CanMerge(CompilerContextData contextData, int activ
                         }
                     }
 
+                    if (actualPasses.IsCreated)
+                        actualPasses.Dispose();
+
                     foreach (ref readonly var fragment in passToMerge.Fragments(contextData))
                     {
                         bool alreadyAttached = false;

Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs

@@ -1951,6 +1951,37 @@ public static DepthBits GetDefaultDepthBufferBits()
 #endif
         }
 
+        /// <summary>
+        /// Indicates whether the combined camera viewports fully cover the screen area.
+        /// </summary>
+        /// <param name="cameras">List of cameras to render.</param>
+        /// <returns>True if the combined camera viewports fully cover the screen area.</returns>
+        public static bool IsScreenFullyCoveredByCameras(List<Camera> cameras)
+        {
+            if (cameras == null || cameras.Count == 0)
+                return false;
+
+            bool isScreenFullyCovered = false;
+            using (ListPool<Rect>.Get(out var cameraRects))
+            {
+                // We don't need to exclude stacked cameras for the input camera list because the overlay camera have the same viewport with its base camera.
+                foreach (var camera in cameras)
+                {
+                    if (camera.targetTexture != null || camera.cameraType != CameraType.Game)
+                        continue;
+
+                    // Skip test if any viewport is full-screen
+                    if (Mathf.Approximately(camera.rect.xMin, 0f) && Mathf.Approximately(camera.rect.yMin, 0f) && camera.rect.width >= Screen.width && camera.rect.height >= Screen.height)
+                        return true;
+
+                    cameraRects.Add(camera.rect);
+                }
+                isScreenFullyCovered = Mathf.Approximately(SweepLineRectUtils.CalculateRectUnionArea(cameraRects), 1f);
+            }
+
+            return isScreenFullyCovered;
+        }
+
 #if UNITY_EDITOR
         /// <summary>
         /// Populates null fields or collection elements in a target object from a source object of the same type.