Merge pull request #8252 from Unity-Technologies/internal/6000.4/staging

Mirror Internal/6000.4/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/Runtime/Material/Water/Water.hlsl

@@ -415,9 +415,6 @@ PreLightData GetPreLightData(float3 V, PositionInputs posInput, inout BSDFData b
     // Grab the water profile of this surface
     WaterSurfaceProfile profile = _WaterSurfaceProfiles[bsdfData.surfaceIndex];
 
-    // Make sure to apply the smoothness fade
-    EvaluateSmoothnessFade(posInput.positionWS, profile, bsdfData);
-
     // Profile data
     preLightData.tipScatteringHeight = profile.tipScatteringHeight;
     preLightData.bodyScatteringHeight = profile.bodyScatteringHeight;

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.PostProcess.cs

@@ -4142,6 +4142,7 @@ TextureHandle LensFlareScreenSpacePass(RenderGraph renderGraph, HDCamera hdCamer
 
             int ratio = (int)m_LensFlareScreenSpace.resolution.value;
             Color tintColor = m_LensFlareScreenSpace.tintColor.value;
+            int bloomMip = m_LensFlareScreenSpace.bloomMip.value;
 
             using (var builder = renderGraph.AddUnsafePass<LensFlareScreenSpaceData>("Lens Flare Screen Space", out var passData, ProfilingSampler.Get(HDProfileId.LensFlareScreenSpace)))
             {
@@ -4151,7 +4152,10 @@ TextureHandle LensFlareScreenSpacePass(RenderGraph renderGraph, HDCamera hdCamer
                 passData.viewport = postProcessViewportSize;
                 passData.hdCamera = hdCamera;
                 passData.screenSpaceLensFlareBloomMipTexture = screenSpaceLensFlareBloomMipTexture;
-                builder.UseTexture(passData.screenSpaceLensFlareBloomMipTexture, AccessFlags.ReadWrite);
+                // NOTE: SSLF mip texture is usually the bloom.mip[N] and the BloomTexture is bloom.mip[0]. Sometimes N == 0 which causes double UseTexture error.
+                // Check if we are trying to use the same texture twice in the RG.
+                if(bloomMip != 0)
+                    builder.UseTexture(passData.screenSpaceLensFlareBloomMipTexture, AccessFlags.ReadWrite);
                 passData.originalBloomTexture = originalBloomTexture;
                 builder.UseTexture(passData.originalBloomTexture, AccessFlags.ReadWrite);
 

Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.Prepass.cs

@@ -1606,7 +1606,7 @@ void DownsampleDepthForLowResTransparency(RenderGraph renderGraph, HDCamera hdCa
                             scaleBias.w = data.loadOffset.y;
                         }
                         natCmd.SetGlobalVector(HDShaderIDs._ScaleBias, scaleBias);
-
+                        natCmd.SetGlobalTexture(HDShaderIDs._CameraDepthTexture, data.depthTexture);
                         natCmd.SetViewport(data.viewport);
                         natCmd.DrawProcedural(Matrix4x4.identity, data.downsampleDepthMaterial, 0, MeshTopology.Triangles, 3, 1, null);
                     });