WIP: update CommandList and add ComputeShader Sample

Engine/AutoGeneratedCoreBindings.cs

@@ -5141,14 +5141,6 @@ public static CommandList TryGetFromCache(IntPtr native)
         [EditorBrowsable(EditorBrowsableState.Never)]
         private static extern void cbg_CommandList_ResumeRenderPass(IntPtr selfPtr);
 
-        [DllImport("Altseed2_Core")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        private static extern void cbg_CommandList_UploadBuffer(IntPtr selfPtr, IntPtr buffer);
-
-        [DllImport("Altseed2_Core")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        private static extern void cbg_CommandList_ReadbackBuffer(IntPtr selfPtr, IntPtr buffer);
-
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         private static extern void cbg_CommandList_CopyBuffer(IntPtr selfPtr, IntPtr src, IntPtr dst);
@@ -5177,6 +5169,10 @@ public static CommandList TryGetFromCache(IntPtr native)
         [EditorBrowsable(EditorBrowsableState.Never)]
         private static extern void cbg_CommandList_SetIndexBuffer(IntPtr selfPtr, IntPtr ib, int stride, int offset);
 
+        [DllImport("Altseed2_Core")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private static extern void cbg_CommandList_SetMaterialWithConstantBuffer(IntPtr selfPtr, IntPtr material, IntPtr constantBuffer);
+
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         private static extern void cbg_CommandList_BeginComputePass(IntPtr selfPtr);
@@ -5187,7 +5183,11 @@ public static CommandList TryGetFromCache(IntPtr native)
 
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private static extern void cbg_CommandList_SetComputeBuffer(IntPtr selfPtr, IntPtr buffer, int stride, int unit);
+        private static extern void cbg_CommandList_SetComputeBuffer(IntPtr selfPtr, IntPtr buffer, int stride, int unit, int shaderStage);
+
+        [DllImport("Altseed2_Core")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private static extern void cbg_CommandList_SetComputePipelineStateWithConstantBuffer(IntPtr selfPtr, IntPtr computePipelineState, IntPtr constantBuffer);
 
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -5327,16 +5327,6 @@ public void ResumeRenderPass()
             cbg_CommandList_ResumeRenderPass(selfPtr);
         }
 
-        internal void UploadBuffer(Buffer buffer)
-        {
-            cbg_CommandList_UploadBuffer(selfPtr, buffer != null ? buffer.selfPtr : IntPtr.Zero);
-        }
-
-        internal void ReadbackBuffer(Buffer buffer)
-        {
-            cbg_CommandList_ReadbackBuffer(selfPtr, buffer != null ? buffer.selfPtr : IntPtr.Zero);
-        }
-
         internal void CopyBuffer(Buffer src, Buffer dst)
         {
             cbg_CommandList_CopyBuffer(selfPtr, src != null ? src.selfPtr : IntPtr.Zero, dst != null ? dst.selfPtr : IntPtr.Zero);
@@ -5386,6 +5376,11 @@ internal void SetIndexBuffer(Buffer ib, int stride, int offset)
             cbg_CommandList_SetIndexBuffer(selfPtr, ib != null ? ib.selfPtr : IntPtr.Zero, stride, offset);
         }
 
+        internal void SetMaterialWithConstantBuffer(Material material, Buffer constantBuffer)
+        {
+            cbg_CommandList_SetMaterialWithConstantBuffer(selfPtr, material != null ? material.selfPtr : IntPtr.Zero, constantBuffer != null ? constantBuffer.selfPtr : IntPtr.Zero);
+        }
+
         public void BeginComputePass()
         {
             cbg_CommandList_BeginComputePass(selfPtr);
@@ -5396,9 +5391,14 @@ public void EndComputePass()
             cbg_CommandList_EndComputePass(selfPtr);
         }
 
-        internal void SetComputeBuffer(Buffer buffer, int stride, int unit)
+        internal void SetComputeBuffer(Buffer buffer, int stride, int unit, ShaderStage shaderStage)
         {
-            cbg_CommandList_SetComputeBuffer(selfPtr, buffer != null ? buffer.selfPtr : IntPtr.Zero, stride, unit);
+            cbg_CommandList_SetComputeBuffer(selfPtr, buffer != null ? buffer.selfPtr : IntPtr.Zero, stride, unit, (int)shaderStage);
+        }
+
+        internal void SetComputePipelineStateWithConstantBuffer(ComputePipelineState computePipelineState, Buffer constantBuffer)
+        {
+            cbg_CommandList_SetComputePipelineStateWithConstantBuffer(selfPtr, computePipelineState != null ? computePipelineState.selfPtr : IntPtr.Zero, constantBuffer != null ? constantBuffer.selfPtr : IntPtr.Zero);
         }
 
         public void Dispatch(int x, int y, int z)
@@ -5512,11 +5512,19 @@ public static Graphics TryGetFromCache(IntPtr native)
 
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private static extern void cbg_Graphics_ExecuteCommandList(IntPtr selfPtr);
+        private static extern void cbg_Graphics_ExecuteCommandList_(IntPtr selfPtr);
+
+        [DllImport("Altseed2_Core")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private static extern void cbg_Graphics_ExecuteCommandList_CommandList(IntPtr selfPtr, IntPtr commandList);
 
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
-        private static extern void cbg_Graphics_WaitFinish(IntPtr selfPtr);
+        private static extern void cbg_Graphics_WaitFinish_(IntPtr selfPtr);
+
+        [DllImport("Altseed2_Core")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private static extern void cbg_Graphics_WaitFinish_CommandList(IntPtr selfPtr, IntPtr commandList);
 
         [DllImport("Altseed2_Core")]
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -5611,12 +5619,22 @@ public static void Terminate()
 
         public void ExecuteCommandList()
         {
-            cbg_Graphics_ExecuteCommandList(selfPtr);
+            cbg_Graphics_ExecuteCommandList_(selfPtr);
+        }
+
+        public void ExecuteCommandList(CommandList commandList)
+        {
+            cbg_Graphics_ExecuteCommandList_CommandList(selfPtr, commandList != null ? commandList.selfPtr : IntPtr.Zero);
         }
 
         public void WaitFinish()
         {
-            cbg_Graphics_WaitFinish(selfPtr);
+            cbg_Graphics_WaitFinish_(selfPtr);
+        }
+
+        public void WaitFinish(CommandList commandList)
+        {
+            cbg_Graphics_WaitFinish_CommandList(selfPtr, commandList != null ? commandList.selfPtr : IntPtr.Zero);
         }
 
         /// <summary>

Engine/CorePartial/Buffer.cs

@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Altseed2
+{
+    /// <summary>
+    /// CPU/GPUバッファ
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class Buffer<T> where T : struct
+    {
+        internal Buffer InternalBuffer { get; }
+
+        /// <summary>
+        /// バッファ内の要素数
+        /// </summary>
+        public int Count { get; }
+
+        /// <summary>
+        /// バッファのサイズ
+        /// </summary>
+        public int Size => InternalBuffer.Size;
+
+        /// <summary>
+        /// バッファの使途
+        /// </summary>
+        public BufferUsageType BufferUsage => InternalBuffer.BufferUsage;
+
+        Buffer(Buffer internalBuffer, int count)
+        {
+            InternalBuffer = internalBuffer;
+            Count = count;
+        }
+
+        /// <summary>
+        /// バッファを生成します
+        /// </summary>
+        /// <param name="usage">バッファの使途</param>
+        /// <param name="count">要素数</param>
+        /// <returns><see cref="Buffer{T}"/>のインスタンス</returns>
+        public static Buffer<T> Create(BufferUsageType usage, int count)
+        {
+            var internalBuffer = Buffer.Create(usage, Marshal.SizeOf<T>() * count);
+            if (internalBuffer is null)
+            {
+                Engine.Log.Error(LogCategory.Engine, "Buffer<T>::Create: bufferの作成に失敗しました。");
+                return null;
+            }
+
+            return new Buffer<T>(internalBuffer, count);
+        }
+
+        /// <summary>
+        /// バッファを生成します
+        /// </summary>
+        /// <param name="usage">バッファの使途</param>
+        /// <param name="count">要素数</param>
+        /// <returns><see cref="Buffer{T}"/>のインスタンス</returns>
+        /// <exceptions><see cref="ArgumentException"/>バッファの作成に失敗</exceptions>
+        public static Buffer<T> CreateStrict(BufferUsageType usage, int count)
+        {
+            var internalBuffer = Buffer.Create(usage, Marshal.SizeOf<T>() * count);
+            if (internalBuffer is null)
+            {
+                throw new ArgumentException("Bufferの作成に失敗しました。");
+            }
+
+            return new Buffer<T>(internalBuffer, count);
+        }
+
+        /// <summary>
+        /// バッファのデータへアクセスする
+        /// </summary>
+        /// <returns>バッファのデータ<see cref="ReadOnlySpan{T}"/>を持つ<see cref="ReadContainer"/></returns>
+        public ReadContainer ReadLock()
+        {
+            unsafe
+            {
+                var lockPtr = InternalBuffer.Lock();
+
+                if (lockPtr == IntPtr.Zero
+                    || ((InternalBuffer.BufferUsage & BufferUsageType.MapRead) == 0
+                        && (InternalBuffer.BufferUsage & BufferUsageType.MapWrite) == 0)
+                )
+                {
+                    return new ReadContainer(null, null);
+                }
+                return new ReadContainer(this, new ReadOnlySpan<T>(lockPtr.ToPointer(), Count));
+            }
+        }
+
+        /// <summary>
+        /// バッファのデータへアクセスする。
+        /// </summary>
+        /// <returns>バッファのデータ<see cref="Span{T}"/>を持つ<see cref="ReadContainer"/></returns>
+        /// <exception cref="InvalidOperationException">バッファのロックに失敗</exception>
+        public ReadContainer ReadLockStrict()
+        {
+            var container = ReadLock();
+
+            if (container.Span == null)
+            {
+                throw new InvalidOperationException("バッファのロックに失敗しました。");
+            }
+
+            return container;
+        }
+
+        /// <summary>
+        /// バッファのデータへアクセスする
+        /// </summary>
+        /// <returns>バッファのデータ<see cref="Span{T}"/>を持つ<see cref="WriteContainer"/></returns>
+        public WriteContainer WriteLock()
+        {
+            unsafe
+            {
+                var lockPtr = InternalBuffer.Lock();
+
+                if (lockPtr == IntPtr.Zero || ((InternalBuffer.BufferUsage & BufferUsageType.MapWrite) == 0))
+                {
+                    return new WriteContainer(null, null);
+                }
+                return new WriteContainer(this, new Span<T>(lockPtr.ToPointer(), Count));
+            }
+        }
+
+        /// <summary>
+        /// バッファのデータへアクセスする。
+        /// </summary>
+        /// <returns>バッファのデータ<see cref="Span{T}"/>を持つ<see cref="WriteContainer"/></returns>
+        /// <exception cref="InvalidOperationException">バッファのロックに失敗</exception>
+        public WriteContainer WriteLockStrict()
+        {
+            var container = WriteLock();
+
+            if (container.Span == null)
+            {
+                throw new InvalidOperationException("バッファのロックに失敗しました。");
+            }
+
+            return container;
+        }
+
+        /// <summary>
+        /// バッファへ書き込みを行うための情報を保持する構造体。
+        /// </summary>
+        /// <returns></returns>
+        public ref struct ReadContainer
+        {
+            private readonly Buffer<T> buffer;
+
+            /// <summary>
+            /// バッファのデータ
+            /// </summary>
+            /// <returns></returns>
+            public ReadOnlySpan<T> Span { get; private init; }
+
+            /// <summary>
+            /// <see cref="Span{T}"/>がnullではない。
+            /// </summary>
+            public bool IsValid => Span != null;
+
+            internal ReadContainer(Buffer<T> buffer, ReadOnlySpan<T> span)
+            {
+                this.buffer = buffer;
+                Span = span;
+            }
+
+            /// <summary>
+            /// バッファのアンロックを行う
+            /// </summary>
+            public void Dispose() => buffer?.InternalBuffer.Unlock();
+        }
+
+        /// <summary>
+        /// バッファへ書き込みを行うための情報を保持する構造体。
+        /// </summary>
+        /// <returns></returns>
+        public ref struct WriteContainer
+        {
+            private readonly Buffer<T> buffer;
+
+            /// <summary>
+            /// バッファのデータ
+            /// </summary>
+            /// <returns></returns>
+            public Span<T> Span { get; private init; }
+
+            /// <summary>
+            /// <see cref="Span{T}"/>がnullではない。
+            /// </summary>
+            public bool IsValid => Span != null;
+
+            internal WriteContainer(Buffer<T> buffer, Span<T> span)
+            {
+                this.buffer = buffer;
+                Span = span;
+            }
+
+            /// <summary>
+            /// バッファのアンロックを行う
+            /// </summary>
+            public void Dispose() => buffer?.InternalBuffer.Unlock();
+        }
+    }
+}