[9.x.x backport] Merge Hdrp/staging [Skip CI] (#582)

TestProjects/VisualEffectGraph/Assets/AllTests/VFXTests/GraphicsTests/ParticleRibbonLit/ParticleRibbonLitVolumeProfile.asset

@@ -30,16 +30,16 @@ MonoBehaviour:
   m_AdvancedMode: 0
   mode:
     m_OverrideState: 1
-    m_Value: 1
+    m_Value: 0
   meteringMode:
     m_OverrideState: 0
     m_Value: 2
   luminanceSource:
     m_OverrideState: 0
     m_Value: 1
   fixedExposure:
-    m_OverrideState: 0
-    m_Value: 0
+    m_OverrideState: 1
+    m_Value: 7
   compensation:
     m_OverrideState: 0
     m_Value: 0
@@ -86,3 +86,14 @@ MonoBehaviour:
     m_OverrideState: 0
     m_Value: 1
     min: 0.001
+  weightTextureMask:
+    m_OverrideState: 0
+    m_Value: {fileID: 0}
+  histogramPercentages:
+    m_OverrideState: 0
+    m_Value: {x: 40, y: 90}
+    min: 0
+    max: 100
+  histogramUseCurveRemapping:
+    m_OverrideState: 0
+    m_Value: 0

TestProjects/VisualEffectGraph/Packages/manifest.json

@@ -15,7 +15,6 @@
     "com.unity.timeline": "1.2.9",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
-    "com.unity.xr.legacyinputhelpers": "2.1.2",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

com.unity.render-pipelines.core/Runtime/Debugging/ProfilingScope.cs

@@ -98,6 +98,42 @@ public ProfilingSampler(string name)
 #endif
         }
 
+        /// <summary>
+        /// Begin the profiling block.
+        /// </summary>
+        /// <param name="cmd">Command buffer used by the profiling block.</param>
+        public void Begin(CommandBuffer cmd)
+        {
+            if (cmd != null)
+#if UNITY_USE_RECORDER
+                if (sampler != null)
+                    cmd.BeginSample(sampler);
+                else
+                    cmd.BeginSample(name);
+#else
+                cmd.BeginSample(name);
+#endif
+            inlineSampler?.Begin();
+        }
+
+        /// <summary>
+        /// End the profiling block.
+        /// </summary>
+        /// <param name="cmd">Command buffer used by the profiling block.</param>
+        public void End(CommandBuffer cmd)
+        {
+            if (cmd != null)
+#if UNITY_USE_RECORDER
+                if (sampler != null)
+                    cmd.EndSample(sampler);
+                else
+                    cmd.EndSample(name);
+#else
+                    m_Cmd.EndSample(name);
+#endif
+            inlineSampler?.End();
+        }
+
         internal bool IsValid() { return (sampler != null && inlineSampler != null); }
 
         internal CustomSampler sampler { get; private set; }
@@ -187,11 +223,9 @@ public bool enableRecording
     /// </summary>
     public struct ProfilingScope : IDisposable
     {
-        string          m_Name;
-        CommandBuffer   m_Cmd;
-        bool            m_Disposed;
-        CustomSampler   m_Sampler;
-        CustomSampler   m_InlineSampler;
+        CommandBuffer       m_Cmd;
+        bool                m_Disposed;
+        ProfilingSampler    m_Sampler;
 
         /// <summary>
         /// Profiling Scope constructor
@@ -202,29 +236,8 @@ public ProfilingScope(CommandBuffer cmd, ProfilingSampler sampler)
         {
             m_Cmd = cmd;
             m_Disposed = false;
-            if (sampler != null)
-            {
-                m_Name = sampler.name; // Don't use CustomSampler.name because it causes garbage
-                m_Sampler = sampler.sampler;
-                m_InlineSampler = sampler.inlineSampler;
-            }
-            else
-            {
-                m_Name = "NullProfilingSampler"; // Don't use CustomSampler.name because it causes garbage
-                m_Sampler = null;
-                m_InlineSampler = null;
-            }
-
-            if (cmd != null)
-#if UNITY_USE_RECORDER
-                if (m_Sampler != null)
-                    cmd.BeginSample(m_Sampler);
-                else
-                    cmd.BeginSample(m_Name);
-#else
-                cmd.BeginSample(m_Name);
-#endif
-            m_InlineSampler?.Begin();
+            m_Sampler = sampler;
+            m_Sampler?.Begin(m_Cmd);
         }
 
         /// <summary>
@@ -246,16 +259,7 @@ void Dispose(bool disposing)
             // this but will generate garbage on every frame (and this struct is used quite a lot).
             if (disposing)
             {
-                if (m_Cmd != null)
-#if UNITY_USE_RECORDER
-                    if (m_Sampler != null)
-                        m_Cmd.EndSample(m_Sampler);
-                    else
-                        m_Cmd.EndSample(m_Name);
-#else
-                    m_Cmd.EndSample(m_Name);
-#endif
-                m_InlineSampler?.End();
+                m_Sampler?.End(m_Cmd);
             }
 
             m_Disposed = true;