[10.x.x] Merge Hdrp/staging [Skip CI]

TestProjects/HDRP_DXR_Tests/LocalPackages/com.unity.render-pipelines.high-definition-config/Runtime/ShaderConfig.cs

@@ -58,6 +58,9 @@ public enum ShaderOptions
     // Changing a value in this enum Config here require to regenerate the hlsl include and recompile C# and shaders
     public class ShaderConfig
     {
+        public const int k_XRMaxViewsForCBuffer = 2;         // REALLY IMPORTANT! This needs to be the maximum possible XrMaxViews for any supported platform!
+                                                             // this needs to be constant and not vary like XrMaxViews does as it is used to generate the cbuffer declarations
+
         public static int s_CameraRelativeRendering = (int)ShaderOptions.CameraRelativeRendering;
         public static int s_PreExposition = (int)ShaderOptions.PreExposition;
         public static int s_XrMaxViews = (int)ShaderOptions.XrMaxViews;

TestProjects/HDRP_Tests/Assets/Tests/TestFilters/TestCaseFilters.asset

@@ -178,17 +178,17 @@ MonoBehaviour:
   - FilteredScene: {fileID: 102900000, guid: 09baf18a7e1f6584f86675e6a2141c66, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 18
+    GraphicsDevice: 21
     XrSdk: 
     StereoModes: 0
-    Reason: Randomly fail on yamato
+    Reason: flip flop
   - FilteredScene: {fileID: 102900000, guid: 09baf18a7e1f6584f86675e6a2141c66, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 21
+    GraphicsDevice: 18
     XrSdk: 
     StereoModes: 0
-    Reason: flip flop
+    Reason: Randomly fail on yamato
   - FilteredScene: {fileID: 102900000, guid: 292a7700209ba7c49ab0bcef8b7c8940, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
@@ -203,6 +203,13 @@ MonoBehaviour:
     XrSdk: 
     StereoModes: 0
     Reason: 'unstable: Geometry explode on Yamato'
+  - FilteredScene: {fileID: 102900000, guid: 9fdfbe7bced924d4791cf6fa031218d2, type: 3}
+    ColorSpace: 1
+    BuildPlatform: -2
+    GraphicsDevice: 16
+    XrSdk: 
+    StereoModes: 0
+    Reason: 'unstable: Geometry explode on Yamato'
   - FilteredScene: {fileID: 102900000, guid: c034386e3fb58f44783743edf9b0f4a4, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
@@ -437,17 +444,17 @@ MonoBehaviour:
   - FilteredScene: {fileID: 102900000, guid: e75b9916869e2384b8e53bc6bffb1314, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 21
+    GraphicsDevice: 18
     XrSdk: 
     StereoModes: 0
-    Reason: flip flop
+    Reason: unstable
   - FilteredScene: {fileID: 102900000, guid: e75b9916869e2384b8e53bc6bffb1314, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 18
+    GraphicsDevice: 21
     XrSdk: 
     StereoModes: 0
-    Reason: unstable
+    Reason: flip flop
   - FilteredScene: {fileID: 102900000, guid: 277b6e81295b84afaa297d0889efb8a1, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
@@ -504,6 +511,13 @@ MonoBehaviour:
     XrSdk: 
     StereoModes: 0
     Reason: flip flop
+  - FilteredScene: {fileID: 102900000, guid: d00305c429b50834eb16887388118552, type: 3}
+    ColorSpace: 1
+    BuildPlatform: -2
+    GraphicsDevice: 16
+    XrSdk: 
+    StereoModes: 0
+    Reason: 'unstable: Geometry explode on Yamato'
   - FilteredScene: {fileID: 102900000, guid: d00305c429b50834eb16887388118552, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
@@ -518,7 +532,7 @@ MonoBehaviour:
     XrSdk: 
     StereoModes: 0
     Reason: flip flop
-  - FilteredScene: {fileID: 102900000, guid: d00305c429b50834eb16887388118552, type: 3}
+  - FilteredScene: {fileID: 102900000, guid: c94380e34bef7d24c9d95f520ee006b1, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
     GraphicsDevice: 16
@@ -532,7 +546,7 @@ MonoBehaviour:
     XrSdk: 
     StereoModes: 0
     Reason: flip flop
-  - FilteredScene: {fileID: 102900000, guid: c94380e34bef7d24c9d95f520ee006b1, type: 3}
+  - FilteredScene: {fileID: 102900000, guid: 4f2cb986918804f4aad481246d4b54ba, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
     GraphicsDevice: 16
@@ -549,17 +563,17 @@ MonoBehaviour:
   - FilteredScene: {fileID: 102900000, guid: 6cfc34a76b5a8334b850c3129d9069c7, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 16
+    GraphicsDevice: 21
     XrSdk: 
     StereoModes: 0
-    Reason: 'unstable: Geometry explode on Yamato'
+    Reason: flip flop
   - FilteredScene: {fileID: 102900000, guid: 6cfc34a76b5a8334b850c3129d9069c7, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 21
+    GraphicsDevice: 16
     XrSdk: 
     StereoModes: 0
-    Reason: flip flop
+    Reason: 'unstable: Geometry explode on Yamato'
   - FilteredScene: {fileID: 102900000, guid: aa2b8ed7d0d276340b794c91ebc7cdce, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
@@ -612,24 +626,24 @@ MonoBehaviour:
   - FilteredScene: {fileID: 102900000, guid: 520aec2f141eeaf4daceb4e016157b78, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 21
+    GraphicsDevice: 16
     XrSdk: 
     StereoModes: 0
-    Reason: unstable
+    Reason: unstable on yamato
   - FilteredScene: {fileID: 102900000, guid: 520aec2f141eeaf4daceb4e016157b78, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 16
+    GraphicsDevice: 18
     XrSdk: 
     StereoModes: 0
-    Reason: unstable on yamato
+    Reason: unstable with Yamato
   - FilteredScene: {fileID: 102900000, guid: 520aec2f141eeaf4daceb4e016157b78, type: 3}
     ColorSpace: 1
     BuildPlatform: -2
-    GraphicsDevice: 18
+    GraphicsDevice: 21
     XrSdk: 
     StereoModes: 0
-    Reason: unstable with Yamato
+    Reason: unstable
   - FilteredScene: {fileID: 102900000, guid: 78446c36daacd444c8a07b5671274a51, type: 3}
     ColorSpace: 1
     BuildPlatform: -2

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

@@ -118,6 +118,19 @@ public enum TextureSizeMode
         Functor
     }
 
+    /// <summary>
+    /// Subset of the texture desc containing information for fast memory allocation (when platform supports it)
+    /// </summary>
+    public struct FastMemoryDesc
+    {
+        ///<summary>Whether the texture will be in fast memory.</summary>
+        public bool inFastMemory;
+        ///<summary>Flag to determine what parts of the render target is spilled if not fully resident in fast memory.</summary>
+        public FastMemoryFlags flags;
+        ///<summary>How much of the render target is to be switched into fast memory (between 0 and 1).</summary>
+        public float residencyFraction;
+    }
+
     /// <summary>
     /// Descriptor used to create texture resources
     /// </summary>
@@ -169,6 +182,8 @@ public struct TextureDesc
         public RenderTextureMemoryless memoryless;
         ///<summary>Texture name.</summary>
         public string name;
+        ///<summary>Descriptor to determine how the texture will be in fast memory on platform that supports it.</summary>
+        public FastMemoryDesc fastMemoryDesc;
 
         // Initial state. Those should not be used in the hash
         ///<summary>Texture needs to be cleared on first use.</summary>
@@ -544,6 +559,12 @@ internal void CreateAndClearTexture(RenderGraphContext rgContext, TextureHandle
             {
                 CreateTextureForPass(ref resource);
 
+                var fastMemDesc = resource.desc.fastMemoryDesc;
+                if(fastMemDesc.inFastMemory)
+                {
+                    resource.rt.SwitchToFastMemory(rgContext.cmd, fastMemDesc.residencyFraction, fastMemDesc.flags);
+                }
+
                 if (resource.desc.clearBuffer || m_RenderGraphDebug.clearRenderTargetsAtCreation)
                 {
                     bool debugClear = m_RenderGraphDebug.clearRenderTargetsAtCreation && !resource.desc.clearBuffer;

com.unity.render-pipelines.core/Runtime/Textures/RTHandle.cs

@@ -145,5 +145,51 @@ public Vector2Int GetScaledSize(Vector2Int refSize)
                     );
             }
         }
+
+        /// <summary>
+        /// Switch the render target to fast memory on platform that have it.
+        /// </summary>
+        /// <param name="cmd">Command buffer used for rendering.</param>
+        /// <param name="residencyFraction">How much of the render target is to be switched into fast memory (between 0 and 1).</param>
+        /// <param name="flags">Flag to determine what parts of the render target is spilled if not fully resident in fast memory.</param>
+        /// <param name="copyContents">Whether the content of render target are copied or not when switching to fast memory.</param>
+
+        public void SwitchToFastMemory(CommandBuffer cmd,
+            float residencyFraction = 1.0f,
+            FastMemoryFlags flags = FastMemoryFlags.SpillTop,
+            bool copyContents = false
+            )
+        {
+#if UNITY_2020_2_OR_NEWER
+            residencyFraction = Mathf.Clamp01(residencyFraction);
+            cmd.SwitchIntoFastMemory(m_RT, flags, residencyFraction, copyContents);
+#endif
+        }
+
+        /// <summary>
+        /// Switch the render target to fast memory on platform that have it and copies the content.
+        /// </summary>
+        /// <param name="cmd">Command buffer used for rendering.</param>
+        /// <param name="residencyFraction">How much of the render target is to be switched into fast memory (between 0 and 1).</param>
+        /// <param name="flags">Flag to determine what parts of the render target is spilled if not fully resident in fast memory.</param>
+        public void CopyToFastMemory(CommandBuffer cmd,
+            float residencyFraction = 1.0f,
+            FastMemoryFlags flags = FastMemoryFlags.SpillTop
+            )
+        {
+            SwitchToFastMemory(cmd, residencyFraction, flags, copyContents: true);
+        }
+
+        /// <summary>
+        /// Switch out the render target from fast memory back to main memory on platforms that have fast memory.
+        /// </summary>
+        /// <param name="cmd">Command buffer used for rendering.</param>
+        /// <param name="copyContents">Whether the content of render target are copied or not when switching out fast memory.</param>
+        public void SwitchOutFastMemory(CommandBuffer cmd, bool copyContents = true)
+        {
+#if UNITY_2020_2_OR_NEWER
+            cmd.SwitchOutOfFastMemory(m_RT, copyContents);
+#endif
+        }
     }
 }