Merge pull request #8250 from Unity-Technologies/internal/6000.0/staging

Mirror Internal/6000.0/staging

Author: KEngelstoft

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

@@ -2,3 +2,4 @@
 
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")]
+[assembly: InternalsVisibleTo("UnityEngine.TestTools.Graphics.Contexts")]

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

@@ -89,14 +89,14 @@ internal static bool IsGPUResidentDrawerSupportedBySRP(GPUResidentDrawerSettings
                 message = Strings.allowInEditModeDisabled;
                 return false;
             }
-			
+
 			// Disable GRD in any external AssetImporter child process. GRD isn't made for AssetImporter workflow/lifetime
 			// Avoid memory leak warning messages and also some future issues (UUM-90039)
             if (AssetDatabase.IsAssetImportWorkerProcess())
                 return false;
 #endif
             // If we are forcing the system, no need to perform further checks
-            if (IsForcedOnViaCommandLine())
+            if (IsForcedOnViaCommandLine() || MaintainContext)
                 return true;
 
             if (GraphicsSettings.currentRenderPipeline is not IGPUResidentRenderPipeline asset)

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

@@ -113,7 +113,7 @@ public static void UpdateInstanceOccluders(RenderGraph renderGraph, in OccluderP
         public static void ReinitializeIfNeeded()
         {
 #if UNITY_EDITOR
-            if (!IsForcedOnViaCommandLine() && (IsProjectSupported() != IsEnabled()))
+            if (!IsForcedOnViaCommandLine() && !MaintainContext && (IsProjectSupported() != IsEnabled()))
             {
                 Reinitialize();
             }
@@ -247,7 +247,7 @@ internal static GPUResidentDrawerSettings GetGlobalSettingsFromRPAsset()
         /// Is GRD forced on via the command line via -force-gpuresidentdrawer. Editor only.
         /// </summary>
         /// <returns>true if forced on</returns>
-        private static bool IsForcedOnViaCommandLine()
+        internal static bool IsForcedOnViaCommandLine()
         {
 #if UNITY_EDITOR
             return s_IsForcedOnViaCommandLine;
@@ -260,7 +260,7 @@ private static bool IsForcedOnViaCommandLine()
         /// Is occlusion culling forced on via the command line via -force-gpuocclusion. Editor only.
         /// </summary>
         /// <returns>true if forced on</returns>
-        private static bool IsOcclusionForcedOnViaCommandLine()
+        internal static bool IsOcclusionForcedOnViaCommandLine()
         {
 #if UNITY_EDITOR
             return s_IsOcclusionForcedOnViaCommandLine;
@@ -269,6 +269,10 @@ private static bool IsOcclusionForcedOnViaCommandLine()
 #endif
         }
 
+        internal static bool MaintainContext { get; set; } = false;
+
+        internal static bool ForceOcclusion { get; set; } = false;
+
         internal static void Reinitialize()
         {
             var settings = GetGlobalSettingsFromRPAsset();

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

@@ -61,6 +61,7 @@ public class InternalRenderGraphContext
         internal RenderGraphDefaultResources defaultResources;
         internal RenderGraphPass executingPass;
         internal bool contextlessTesting;
+        internal bool forceResourceCreation;
     }
 
     // This whole thing is  a bit of a mess InternalRenderGraphContext is public (but all members are internal)
@@ -1186,6 +1187,15 @@ public void BeginRecording(in RenderGraphParameters parameters)
             m_RenderGraphContext.renderGraphPool = m_RenderGraphPool;
             m_RenderGraphContext.defaultResources = m_DefaultResources;
 
+            // With the actual implementation of the Frame Debugger, we cannot re-use resources during the same frame
+            // or it breaks the rendering of the pass preview, since the FD copies the texture after the execution of the RG.
+            m_RenderGraphContext.forceResourceCreation =
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+                FrameDebugger.enabled;
+#else
+            false;
+#endif
+
             if (m_DebugParameters.immediateMode)
             {
                 UpdateCurrentCompiledGraph(graphHash: -1, forceNoCaching: true);

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

@@ -1034,7 +1034,7 @@ internal bool CreatePooledResource(InternalRenderGraphContext rgContext, int typ
             var resource = m_RenderGraphResources[type].resourceArray[index];
             if (!resource.imported)
             {
-                resource.CreatePooledGraphicsResource();
+                resource.CreatePooledGraphicsResource(rgContext.forceResourceCreation);
 
                 if (m_RenderGraphDebug.enableLogging)
                     resource.LogCreation(m_FrameInformationLogger);

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

@@ -188,7 +188,7 @@ public virtual bool NeedsFallBack()
             return requestFallBack && writeCount == 0;
         }
 
-        public virtual void CreatePooledGraphicsResource() { }
+        public virtual void CreatePooledGraphicsResource(bool forceResourceCreation) { }
         public virtual void CreateGraphicsResource() { }
         public virtual void UpdateGraphicsResource() { }
         public virtual void ReleasePooledGraphicsResource(int frameIndex) { }
@@ -236,7 +236,7 @@ public override void ReleaseGraphicsResource()
             graphicsResource = null;
         }
 
-        public override void CreatePooledGraphicsResource()
+        public override void CreatePooledGraphicsResource(bool forceResourceCreation)
         {
             Debug.Assert(m_Pool != null, "RenderGraphResource: CreatePooledGraphicsResource should only be called for regular pooled resources");
 
@@ -247,7 +247,7 @@ public override void CreatePooledGraphicsResource()
 
             // If the pool doesn't have any available resource that we can use, we will create one
             // In any case, we will update the graphicsResource name based on the RenderGraph resource name
-            if (!m_Pool.TryGetResource(hashCode, out graphicsResource))
+            if (forceResourceCreation || !m_Pool.TryGetResource(hashCode, out graphicsResource))
             {
                 CreateGraphicsResource();
             }

Packages/com.unity.render-pipelines.core/Runtime/XR/XRGraphicsAutomatedTests.cs

@@ -24,7 +24,7 @@ static bool activatedFromCommandLine
         /// <summary>
         /// Used by render pipelines to initialize XR tests.
         /// </summary>
-        public static bool enabled { get; } = activatedFromCommandLine;
+        public static bool enabled { get; set; } = activatedFromCommandLine;
 
         /// <summary>
         /// Set by automated test framework and read by render pipelines.

Packages/com.unity.render-pipelines.core/ShaderLibrary/Color.hlsl

@@ -651,7 +651,7 @@ float3 AcesTonemap(float3 aces)
 
     // --- Red modifier --- //
     half hue = rgb_2_hue(half3(aces));
-    half centeredHue = center_hue(hue, RRT_RED_HUE);
+    float centeredHue = center_hue(hue, RRT_RED_HUE); // UUM-125596 Must be float for subsequent calculations
     float hueWeight;
     {
         //hueWeight = cubic_basis_shaper(centeredHue, RRT_RED_WIDTH);

Packages/com.unity.render-pipelines.core/ShaderLibrary/UnityDOTSInstancing.hlsl

@@ -294,7 +294,7 @@ void SetupDOTSInstanceSelectMasks() {}
 
 #ifdef UNITY_DOTS_INSTANCING_UNIFORM_BUFFER
 CBUFFER_START(unity_DOTSInstancing_IndirectInstanceVisibility)
-    float4 unity_DOTSInstancing_IndirectInstanceVisibilityRaw[4096];
+    float4 unity_DOTSInstancing_IndirectInstanceVisibilityRaw[1024];
 CBUFFER_END
 #else
 ByteAddressBuffer unity_DOTSInstancing_IndirectInstanceVisibility;

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs

@@ -19,8 +19,6 @@ public CustomColorBufferNode()
             UpdateNodeAfterDeserialization();
         }
 
-        public override string documentationURL => NodeUtils.GetDocumentationString("HD-Custom-Color");
-
         const int kUvInputSlotId = 0;
         const string kUvInputSlotName = "UV";