Buffer Upload

Author: 2A5F

Coplt.Graphics.Core/Core/CommandList.cs

@@ -466,7 +466,7 @@ public void Dispatch(
 
     #region BufferCopy
 
-    public void BufferCopy(
+    public void Copy(
         GpuBuffer Dst,
         GpuBuffer Src,
         ulong DstOffset = 0,
@@ -507,5 +507,48 @@ public void BufferCopy(
 
     #endregion
 
+    #region BufferUpload
+
+    public void Upload<T>(
+        GpuBuffer Dst,
+        ReadOnlySpan<T> Data,
+        ulong DstOffset = 0,
+        CommandFlags flags = CommandFlags.None
+    ) where T : unmanaged => Upload(Dst, MemoryMarshal.AsBytes(Data), DstOffset, flags);
+
+    public void Upload(
+        GpuBuffer Dst,
+        ReadOnlySpan<byte> Data,
+        ulong DstOffset = 0,
+        CommandFlags flags = CommandFlags.None
+    )
+    {
+        if (Data.Length == 0) return;
+        var Size = Math.Min(Dst.Size, (uint)Data.Length);
+        var dst = AddResource(Dst);
+        var src = m_queue.WriteToUpload(Data);
+        var cmd = new FCommandBufferCopy
+        {
+            Size = Size,
+            DstOffset = DstOffset,
+            SrcOffset = src.Offset,
+            DstType = FBufferRefType.Buffer,
+            SrcType = FBufferRefType.Upload,
+        };
+        cmd.Dst.Buffer = new(dst);
+        cmd.Src.Upload = new(src);
+        m_commands.Add(
+            new()
+            {
+                Type = FCommandType.BufferCopy,
+                Flags = (FCommandFlags)flags,
+                BufferCopy = cmd,
+            }
+        );
+        Dst.UnsafeChangeState(FResourceState.CopyDst);
+    }
+
+    #endregion
+
     #endregion
 }

Coplt.Graphics.Core/Core/GpuQueue.cs

@@ -161,4 +161,36 @@ public GpuBuffer CreateBuffer(
     }
 
     #endregion
+
+    #region WriteToUpload
+
+    public UploadLoc WriteToUpload(ReadOnlySpan<byte> Data)
+    {
+        using var _ = m_lock.EnterScope();
+        ref var upload_buffers = ref m_ptr->m_context->m_upload_buffer;
+        for (nuint i = 0; i < upload_buffers.LongLength; i++)
+        {
+            ref var block = ref upload_buffers[i];
+            if (block.cur_offset + (uint)Data.Length < block.size)
+            {
+                Data.CopyTo(new Span<byte>(block.mapped_ptr, (int)block.size)[(int)block.cur_offset..]);
+                var loc = new UploadLoc(i, block.cur_offset);
+                block.cur_offset += (uint)Data.Length;
+                return loc;
+            }
+        }
+        m_ptr->m_context->GrowUploadBuffer((uint)Data.Length).TryThrow();
+        upload_buffers = ref m_ptr->m_context->m_upload_buffer;
+        {
+            var i = upload_buffers.LongLength - 1;
+            ref var block = ref upload_buffers[i];
+            if (block.cur_offset + (uint)Data.Length >= block.size) throw new OutOfMemoryException();
+            Data.CopyTo(new Span<byte>(block.mapped_ptr, (int)block.size)[(int)block.cur_offset..]);
+            var loc = new UploadLoc(i, block.cur_offset);
+            block.cur_offset += (uint)Data.Length;
+            return loc;
+        }
+    }
+
+    #endregion
 }

Coplt.Graphics.Core/Core/UploadLoc.cs

@@ -0,0 +1,3 @@
+namespace Coplt.Graphics.Core;
+
+public record struct UploadLoc(nuint Index, ulong Offset);

…plt.Graphics.Core/Native/FResourceSrc.cs …plt.Graphics.Core/Native/FResourceRef.csCoplt.Graphics.Core/Native/FResourceSrc.cs renamed to Coplt.Graphics.Core/Native/FResourceRef.cs Coplt.Graphics.Core/Native/FResourceSrc.cs renamed to Coplt.Graphics.Core/Native/FResourceRef.cs

@@ -1,12 +1,12 @@
 namespace Coplt.Graphics.Native;
 
-public partial struct FResourceSrc
+public partial struct FResourceRef
 {
-    public FResourceSrc(uint index)
+    public FResourceRef(uint index)
     {
         ResourceIndex = index;
     }
-    public FResourceSrc(int index)
+    public FResourceRef(int index)
     {
         ResourceIndex = (uint)index;
     }

Coplt.Graphics.Core/Native/FUploadLoc.cs

@@ -0,0 +1,11 @@
+using Coplt.Graphics.Core;
+
+namespace Coplt.Graphics.Native;
+
+public partial struct FUploadLoc
+{
+    public FUploadLoc(in UploadLoc loc)
+    {
+        Index = (uint)loc.Index;
+    }
+}

Coplt.Graphics.Core/Native/Native.cs

@@ -2103,7 +2103,7 @@ public unsafe partial struct _Anonymous_e__Union
         }
     }
 
-    public partial struct FResourceSrc
+    public partial struct FResourceRef
     {
         [NativeTypeName("Coplt::u32")]
         public uint ResourceIndex;
@@ -2147,8 +2147,8 @@ public partial struct FViewport
 
     public partial struct FCommandTransition
     {
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Resource;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Resource;
 
         [NativeTypeName("Coplt::FResourceState")]
         public FResourceState SrcState;
@@ -2159,8 +2159,8 @@ public partial struct FCommandTransition
 
     public partial struct FCommandPresent
     {
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Image;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Image;
     }
 
     public partial struct FCommandClearColor
@@ -2171,8 +2171,8 @@ public partial struct FCommandClearColor
         [NativeTypeName("Coplt::u32")]
         public uint RectIndex;
 
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Image;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Image;
 
         [NativeTypeName("f32[4]")]
         public _Color_e__FixedBuffer Color;
@@ -2200,8 +2200,8 @@ public partial struct FCommandClearDepthStencil
         [NativeTypeName("Coplt::u32")]
         public uint RectIndex;
 
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Image;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Image;
 
         [NativeTypeName("Coplt::f32")]
         public float Depth;
@@ -2215,13 +2215,13 @@ public partial struct FCommandClearDepthStencil
 
     public partial struct FCommandSetRenderTargets
     {
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Dsv;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Dsv;
 
         [NativeTypeName("Coplt::u32")]
         public uint NumRtv;
 
-        [NativeTypeName("FResourceSrc[8]")]
+        [NativeTypeName("FResourceRef[8]")]
         public _Rtv_e__FixedBuffer Rtv;
 
         [NativeTypeName("Coplt::u32")]
@@ -2239,7 +2239,7 @@ public partial struct FCommandSetRenderTargets
         [InlineArray(8)]
         public partial struct _Rtv_e__FixedBuffer
         {
-            public FResourceSrc e0;
+            public FResourceRef e0;
         }
     }
 
@@ -2314,23 +2314,29 @@ public unsafe partial struct FCommandDispatch
         public FDispatchType Type;
     }
 
+    public partial struct FUploadLoc
+    {
+        [NativeTypeName("Coplt::u32")]
+        public uint Index;
+    }
+
     [StructLayout(LayoutKind.Explicit)]
-    public unsafe partial struct FBufferRef
+    public partial struct FBufferRef
     {
         [FieldOffset(0)]
-        [NativeTypeName("Coplt::FResourceSrc")]
-        public FResourceSrc Buffer;
+        [NativeTypeName("Coplt::FResourceRef")]
+        public FResourceRef Buffer;
 
         [FieldOffset(0)]
-        [NativeTypeName("Coplt::FBlob *")]
-        public FBlob* Blob;
+        [NativeTypeName("Coplt::FUploadLoc")]
+        public FUploadLoc Upload;
     }
 
     [NativeTypeName("Coplt::u8")]
     public enum FBufferRefType : byte
     {
         Buffer = 0,
-        Blob,
+        Upload,
     }
 
     public partial struct FCommandBufferCopy
@@ -2365,7 +2371,7 @@ public partial struct FCommandItem
         [NativeTypeName("Coplt::FCommandFlags")]
         public FCommandFlags Flags;
 
-        [NativeTypeName("__AnonymousRecord_Command_L238_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L245_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [UnscopedRef]

Coplt.Graphics.Native/Api/FFI/Command.h

@@ -68,7 +68,7 @@ namespace Coplt
 #endif
     };
 
-    struct FResourceSrc
+    struct FResourceRef
     {
         // u32::max 表示 empty
         u32 ResourceIndex{};
@@ -103,14 +103,14 @@ namespace Coplt
 
     struct FCommandTransition
     {
-        FResourceSrc Resource{};
+        FResourceRef Resource{};
         FResourceState SrcState{};
         FResourceState DstState{};
     };
 
     struct FCommandPresent
     {
-        FResourceSrc Image{};
+        FResourceRef Image{};
     };
 
     struct FCommandClearColor
@@ -119,7 +119,7 @@ namespace Coplt
         u32 RectCount{};
         // Payload 内的索引
         u32 RectIndex{};
-        FResourceSrc Image{};
+        FResourceRef Image{};
         f32 Color[4]{};
     };
 
@@ -136,7 +136,7 @@ namespace Coplt
         u32 RectCount{};
         // Payload 内的索引
         u32 RectIndex{};
-        FResourceSrc Image{};
+        FResourceRef Image{};
         f32 Depth{};
         u8 Stencil{};
         FDepthStencilClearFlags Clear{};
@@ -145,9 +145,9 @@ namespace Coplt
     struct FCommandSetRenderTargets
     {
         // 可选
-        FResourceSrc Dsv{};
+        FResourceRef Dsv{};
         u32 NumRtv{};
-        FResourceSrc Rtv[8]{};
+        FResourceRef Rtv[8]{};
 
         // 有多少个 Viewport
         u32 ViewportCount{};
@@ -206,16 +206,23 @@ namespace Coplt
         FDispatchType Type{};
     };
 
+    struct FUploadLoc
+    {
+        u32 Index{};
+    };
+
     union FBufferRef
     {
-        FResourceSrc Buffer{};
-        FBlob* Blob;
+        FResourceRef Buffer;
+        FUploadLoc Upload;
     };
 
     enum class FBufferRefType : u8
     {
+        // GpuBuffer 对象资源引用
         Buffer = 0,
-        Blob,
+        // 当前帧上下文中第几个上传缓冲区
+        Upload,
     };
 
     struct FCommandBufferCopy
@@ -266,7 +273,7 @@ namespace Coplt
 
 #ifdef FFI_SRC
 
-    inline FResourceMeta& FResourceSrc::Get(const FCommandSubmit& submit) const
+    inline FResourceMeta& FResourceRef::Get(const FCommandSubmit& submit) const
     {
         return submit.Resources[ResourceIndex];
     }