Merge pull request #8251 from Unity-Technologies/internal/6000.3/staging

Mirror Internal/6000.3/staging

Author: KEngelstoft

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

@@ -118,6 +118,7 @@ public class InternalRenderGraphContext
         internal RenderGraphPass executingPass;
         internal NativeRenderPassCompiler.CompilerContextData compilerContext;
         internal bool contextlessTesting;
+        internal bool forceResourceCreation;
     }
 
     // InternalRenderGraphContext is public (but all members are internal)
@@ -1621,6 +1622,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

@@ -1017,7 +1017,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

@@ -183,7 +183,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) { }
@@ -231,7 +231,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");
 
@@ -242,7 +242,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/Vrs/VrsRenderPipelineRuntimeResources.cs

@@ -7,7 +7,7 @@ namespace UnityEngine.Rendering
     /// </summary>
     [Serializable]
     [SupportedOnRenderPipeline]
-    [Categorization.CategoryInfo(Name = "R: VRS - Runtime Resources", Order = 1000)]
+    [Categorization.CategoryInfo(Name = "VRS - Runtime Resources", Order = 1000)]
     public sealed class VrsRenderPipelineRuntimeResources : IRenderPipelineResources
     {
         /// <summary>
@@ -18,6 +18,7 @@ public sealed class VrsRenderPipelineRuntimeResources : IRenderPipelineResources
         bool IRenderPipelineGraphicsSettings.isAvailableInPlayerBuild => true;
 
         [SerializeField]
+        [Tooltip("Compute shader used for converting textures to shading rate values")]
         [ResourcePath("Runtime/Vrs/Shaders/VrsTexture.compute")]
         ComputeShader m_TextureComputeShader;
 
@@ -31,6 +32,7 @@ public ComputeShader textureComputeShader
         }
 
         [SerializeField]
+        [Tooltip("Shader used when visualizing shading rate values as a color image")]
         [ResourcePath("Runtime/Vrs/Shaders/VrsVisualization.shader")]
         Shader m_VisualizationShader;
 

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.core/Tests/Editor/UnifiedRayTracing/TraceTransparentRays.urtshader

@@ -17,7 +17,7 @@ int _AnyHitDecision;
 
 uint AnyHitExecute(UnifiedRT::HitContext hitContext, inout RayPayload payload)
 {
-    payload.anyHits |= (1 << hitContext.InstanceID());
+    payload.anyHits |= (1u << hitContext.InstanceID());
 
     return _AnyHitDecision;
 }

Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPBuildData.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
@@ -16,6 +17,7 @@ internal class HDRPBuildData : IDisposable
         public List<HDRenderPipelineAsset> renderPipelineAssets { get; private set; } = new List<HDRenderPipelineAsset>();
         public bool playerNeedRaytracing { get; private set; }
         public bool stripDebugVariants { get; private set; } = true;
+        public bool dynamicLightmapsUsed { get; private set; }
         public bool waterDecalMaskAndCurrent { get; private set; }
         public Dictionary<int, ComputeShader> rayTracingComputeShaderCache { get; private set; } = new();
         public Dictionary<int, ComputeShader> computeShaderCache { get; private set; } = new();
@@ -69,13 +71,43 @@ public HDRPBuildData(BuildTarget buildTarget, bool isDevelopmentBuild)
             m_Instance = this;
         }
 
+        public void SetDynamicLightmapsUsedInBuildScenes()
+        {
+            dynamicLightmapsUsed = DynamicLightmapsUsedInBuildScenes();
+        }
+
+        static bool DynamicLightmapsUsedInBuildScenes()
+        {
+            var originalSetup = EditorSceneManager.GetSceneManagerSetup();
+
+            bool dynamicLightmapsUsed = false;
+            foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
+            {
+                if (!scene.enabled) continue;
+
+                EditorSceneManager.OpenScene(scene.path, OpenSceneMode.Single);
+
+                if (Lightmapping.HasDynamicGILightmapTextures())
+                {
+                    dynamicLightmapsUsed = true;
+                    break;
+                }
+            }
+
+            if (originalSetup.Length > 0)
+                EditorSceneManager.RestoreSceneManagerSetup(originalSetup);
+
+            return dynamicLightmapsUsed;
+        }
+
         public void Dispose()
         {
             renderPipelineAssets?.Clear();
             rayTracingComputeShaderCache?.Clear();
             computeShaderCache?.Clear();
             playerNeedRaytracing = false;
             stripDebugVariants = true;
+            dynamicLightmapsUsed = false;
             waterDecalMaskAndCurrent = false;
             buildingPlayerForHDRenderPipeline = false;
             runtimeShaders = null;

Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessBuild.cs

@@ -33,6 +33,9 @@ public void OnPreprocessBuild(BuildReport report)
             bool isDevelopmentBuild = (report.summary.options & BuildOptions.Development) != 0;
             m_BuildData = new HDRPBuildData(EditorUserBuildSettings.activeBuildTarget, isDevelopmentBuild);
 
+            // Since the HDRPBuildData instance is used in a lot of places, doing this check here ensures that it is done before the build starts.
+            m_BuildData.SetDynamicLightmapsUsedInBuildScenes();
+
             if (m_BuildData.buildingPlayerForHDRenderPipeline)
             {
                 // Now that we know that we are on HDRP we need to make sure everything is correct, otherwise we break the build.

Packages/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs

@@ -1,3 +1,4 @@
+using UnityEditor.SceneManagement;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.HighDefinition;
@@ -70,8 +71,10 @@ protected override bool DoShadersStripper(HDRenderPipelineAsset hdrpAsset, Shade
             // Remove editor only pass
             bool isSceneSelectionPass = snippet.passName == "SceneSelectionPass";
             bool isScenePickingPass = snippet.passName == "ScenePickingPass";
-            bool metaPassUnused = (snippet.passName == "META") && (SupportedRenderingFeatures.active.enlighten == false ||
-                ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) == 0);
+
+            bool isEnlightenSupported = SupportedRenderingFeatures.active.enlighten && ((int)SupportedRenderingFeatures.active.lightmapBakeTypes | (int)LightmapBakeType.Realtime) != 0;
+            bool metaPassUnused = (snippet.passName == "META") && (!isEnlightenSupported || !HDRPBuildData.instance.dynamicLightmapsUsed);
+
             bool editorVisualization = inputData.shaderKeywordSet.IsEnabled(m_EditorVisualization);
             if (isSceneSelectionPass || isScenePickingPass || metaPassUnused || editorVisualization)
                 return true;