Finished management of Compute Buffers for render graph.

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

@@ -20,10 +20,9 @@ public struct RenderGraphBuilder : IDisposable
         /// <param name="input">The Texture resource to use as a color render target.</param>
         /// <param name="index">Index for multiple render target usage.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public TextureHandle UseColorBuffer(TextureHandle input, int index)
+        public TextureHandle UseColorBuffer(in TextureHandle input, int index)
         {
-            CheckTransientTexture(input);
-
+            CheckTransientResource(input.handle);
             m_RenderPass.SetColorBuffer(input, index);
             return input;
         }
@@ -34,10 +33,9 @@ public TextureHandle UseColorBuffer(TextureHandle input, int index)
         /// <param name="input">The Texture resource to use as a depth buffer during the pass.</param>
         /// <param name="flags">Specify the access level for the depth buffer. This allows you to say whether you will read from or write to the depth buffer, or do both.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags)
+        public TextureHandle UseDepthBuffer(in TextureHandle input, DepthAccess flags)
         {
-            CheckTransientTexture(input);
-
+            CheckTransientResource(input.handle);
             m_RenderPass.SetDepthBuffer(input, flags);
             return input;
         }
@@ -47,11 +45,10 @@ public TextureHandle UseDepthBuffer(TextureHandle input, DepthAccess flags)
         /// </summary>
         /// <param name="input">The Texture resource to read from during the pass.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public TextureHandle ReadTexture(TextureHandle input)
+        public TextureHandle ReadTexture(in TextureHandle input)
         {
-            CheckTransientTexture(input);
-
-            m_RenderPass.AddTextureRead(input);
+            CheckTransientResource(input.handle);
+            m_RenderPass.AddResourceRead(input.handle);
             return input;
         }
 
@@ -60,12 +57,11 @@ public TextureHandle ReadTexture(TextureHandle input)
         /// </summary>
         /// <param name="input">The Texture resource to write to during the pass.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public TextureHandle WriteTexture(TextureHandle input)
+        public TextureHandle WriteTexture(in TextureHandle input)
         {
-            CheckTransientTexture(input);
-
-            // TODO: Manage resource "version" for debugging purpose
-            m_RenderPass.AddTextureWrite(input);
+            CheckTransientResource(input.handle);
+            // TODO RENDERGRAPH: Manage resource "version" for debugging purpose
+            m_RenderPass.AddResourceWrite(input.handle);
             return input;
         }
 
@@ -78,20 +74,21 @@ public TextureHandle WriteTexture(TextureHandle input)
         public TextureHandle CreateTransientTexture(in TextureDesc desc)
         {
             var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index);
-            m_RenderPass.AddTransientTexture(result);
+            m_RenderPass.AddTransientResource(result.handle);
             return result;
         }
 
         /// <summary>
         /// Create a new Render Graph Texture resource using the descriptor from another texture.
+        /// This texture will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations.
         /// </summary>
         /// <param name="texture">Texture from which the descriptor should be used.</param>
         /// <returns>A new transient TextureHandle.</returns>
-        public TextureHandle CreateTransientTexture(TextureHandle texture)
+        public TextureHandle CreateTransientTexture(in TextureHandle texture)
         {
-            var desc = m_Resources.GetTextureResourceDesc(texture);
+            var desc = m_Resources.GetTextureResourceDesc(texture.handle);
             var result = m_Resources.CreateTexture(desc, 0, m_RenderPass.index);
-            m_RenderPass.AddTransientTexture(result);
+            m_RenderPass.AddTransientResource(result.handle);
             return result;
         }
 
@@ -100,7 +97,7 @@ public TextureHandle CreateTransientTexture(TextureHandle texture)
         /// </summary>
         /// <param name="input">The Renderer List resource to use during the pass.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public RendererListHandle UseRendererList(RendererListHandle input)
+        public RendererListHandle UseRendererList(in RendererListHandle input)
         {
             m_RenderPass.UseRendererList(input);
             return input;
@@ -111,9 +108,10 @@ public RendererListHandle UseRendererList(RendererListHandle input)
         /// </summary>
         /// <param name="input">The Compute Buffer resource to read from during the pass.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input)
+        public ComputeBufferHandle ReadComputeBuffer(in ComputeBufferHandle input)
         {
-            m_RenderPass.AddBufferRead(input);
+            CheckTransientResource(input.handle);
+            m_RenderPass.AddResourceRead(input.handle);
             return input;
         }
 
@@ -122,12 +120,40 @@ public ComputeBufferHandle ReadComputeBuffer(ComputeBufferHandle input)
         /// </summary>
         /// <param name="input">The Compute Buffer resource to write to during the pass.</param>
         /// <returns>An updated resource handle to the input resource.</returns>
-        public ComputeBufferHandle WriteComputeBuffer(ComputeBufferHandle input)
+        public ComputeBufferHandle WriteComputeBuffer(in ComputeBufferHandle input)
         {
-            m_RenderPass.AddBufferWrite(input);
+            CheckTransientResource(input.handle);
+            m_RenderPass.AddResourceWrite(input.handle);
             return input;
         }
 
+        /// <summary>
+        /// Create a new Render Graph Compute Buffer resource.
+        /// This Compute Buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations.
+        /// </summary>
+        /// <param name="desc">Compute Buffer descriptor.</param>
+        /// <returns>A new transient ComputeBufferHandle.</returns>
+        public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferDesc desc)
+        {
+            var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index);
+            m_RenderPass.AddTransientResource(result.handle);
+            return result;
+        }
+
+        /// <summary>
+        /// Create a new Render Graph Compute Buffer resource using the descriptor from another Compute Buffer.
+        /// This Compute Buffer will only be available for the current pass and will be assumed to be both written and read so users don't need to add explicit read/write declarations.
+        /// </summary>
+        /// <param name="computebuffer">Compute Buffer from which the descriptor should be used.</param>
+        /// <returns>A new transient ComputeBufferHandle.</returns>
+        public ComputeBufferHandle CreateTransientComputeBuffer(in ComputeBufferHandle computebuffer)
+        {
+            var desc = m_Resources.GetComputeBufferResourceDesc(computebuffer.handle);
+            var result = m_Resources.CreateComputeBuffer(desc, m_RenderPass.index);
+            m_RenderPass.AddTransientResource(result.handle);
+            return result;
+        }
+
         /// <summary>
         /// Specify the render function to use for this pass.
         /// A call to this is mandatory for the pass to be valid.
@@ -185,12 +211,18 @@ void Dispose(bool disposing)
             m_Disposed = true;
         }
 
-        void CheckTransientTexture(TextureHandle input)
+        void CheckTransientResource(in ResourceHandle res)
         {
-            if (input.IsValid() && input.transientPassIndex != -1 && input.transientPassIndex != m_RenderPass.index)
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+            if (res.IsValid())
             {
-                throw new ArgumentException($"Trying to use a transient texture (pass index {input.transientPassIndex}) in a different pass (pass index {m_RenderPass.index}.");
+                int transientIndex = m_Resources.GetResourceTransientIndex(res);
+                if (transientIndex != -1 && transientIndex != m_RenderPass.index)
+                {
+                    throw new ArgumentException($"Trying to use a transient texture (pass index {transientIndex}) in a different pass (pass index {m_RenderPass.index}.");
+                }
             }
+#endif
         }
         #endregion
     }

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

@@ -26,23 +26,34 @@ public RenderFunc<PassData> GetExecuteDelegate<PassData>()
         public int              colorBufferMaxIndex { get; protected set; } = -1;
         public int              refCount { get; protected set; }
 
-        public List<TextureHandle>          textureReadList = new List<TextureHandle>();
-        public List<TextureHandle>          textureWriteList = new List<TextureHandle>();
-        public List<TextureHandle>          transientTextureList = new List<TextureHandle>();
-        public List<ComputeBufferHandle>    bufferReadList = new List<ComputeBufferHandle>();
-        public List<ComputeBufferHandle>    bufferWriteList = new List<ComputeBufferHandle>();
+        public List<ResourceHandle>[] resourceReadLists = new List<ResourceHandle>[(int)RenderGraphResourceType.Count];
+        public List<ResourceHandle>[] resourceWriteLists = new List<ResourceHandle>[(int)RenderGraphResourceType.Count];
+        public List<ResourceHandle>[] transientResourceList = new List<ResourceHandle>[(int)RenderGraphResourceType.Count];
+
         public List<RendererListHandle>     usedRendererListList = new List<RendererListHandle>();
 
+        public RenderGraphPass()
+        {
+            for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
+            {
+                resourceReadLists[i] = new List<ResourceHandle>();
+                resourceWriteLists[i] = new List<ResourceHandle>();
+                transientResourceList[i] = new List<ResourceHandle>();
+            }
+        }
+
         public void Clear()
         {
             name = "";
             index = -1;
             customSampler = null;
-            textureReadList.Clear();
-            textureWriteList.Clear();
-            bufferReadList.Clear();
-            bufferWriteList.Clear();
-            transientTextureList.Clear();
+            for (int i = 0; i < (int)RenderGraphResourceType.Count; ++i)
+            {
+                resourceReadLists[i].Clear();
+                resourceWriteLists[i].Clear();
+                transientResourceList[i].Clear();
+            }
+
             usedRendererListList.Clear();
             enableAsyncCompute = false;
             allowPassPruning = true;
@@ -57,31 +68,19 @@ public void Clear()
             }
         }
 
-        public void AddTextureWrite(TextureHandle texture)
-        {
-            textureWriteList.Add(texture);
-            refCount++;
-        }
-
-        public void AddTextureRead(TextureHandle texture)
-        {
-            textureReadList.Add(texture);
-        }
-
-        public void AddBufferWrite(ComputeBufferHandle buffer)
+        public void AddResourceWrite(in ResourceHandle res)
         {
-            bufferWriteList.Add(buffer);
-            refCount++;
+            resourceWriteLists[res.iType].Add(res);
         }
 
-        public void AddTransientTexture(TextureHandle texture)
+        public void AddResourceRead(in ResourceHandle res)
         {
-            transientTextureList.Add(texture);
+            resourceReadLists[res.iType].Add(res);
         }
 
-        public void AddBufferRead(ComputeBufferHandle buffer)
+        public void AddTransientResource(in ResourceHandle res)
         {
-            bufferReadList.Add(buffer);
+            transientResourceList[res.iType].Add(res);
         }
 
         public void UseRendererList(RendererListHandle rendererList)
@@ -104,16 +103,16 @@ public void SetColorBuffer(TextureHandle resource, int index)
             Debug.Assert(index < RenderGraph.kMaxMRTCount && index >= 0);
             colorBufferMaxIndex = Math.Max(colorBufferMaxIndex, index);
             colorBuffers[index] = resource;
-            AddTextureWrite(resource);
+            AddResourceWrite(resource.handle);
         }
 
         public void SetDepthBuffer(TextureHandle resource, DepthAccess flags)
         {
             depthBuffer = resource;
             if ((flags & DepthAccess.Read) != 0)
-                AddTextureRead(resource);
+                AddResourceRead(resource.handle);
             if ((flags & DepthAccess.Write) != 0)
-                AddTextureWrite(resource);
+                AddResourceWrite(resource.handle);
         }
     }