save

Author: 2A5F

Coplt.Graphics.Core/Core/CommandList.cs

@@ -1010,7 +1010,7 @@ public RenderScope Render(
         for (var i = 0; i < Info.Rtvs.Length; i++)
         {
             ref readonly var rtv = ref Info.Rtvs[i];
-            if (!rtv.View.Size.Equals(rt_size))
+            if (!rtv.View.Size2d.Equals(rt_size))
                 throw new ArgumentException("RenderTargets And DepthStencil must be the same size");
             info.Rtv[i] = AddResource(rtv.View.Resource);
             info.ResolveInfoIndex[i] = uint.MaxValue; // todo
@@ -1118,8 +1118,7 @@ public ComputeScope Compute(string? Name = null, ReadOnlySpan<byte> Name8 = defa
             InfoIndex = (uint)info_index,
             CommandStartIndex = (uint)m_compute_commands.Count,
         };
-        m_commands.Add(new() { Compute = cmd });
-        return new(this, info_index, m_compute_commands.Count, m_compute_commands, debug_scope);
+        return new(this, info_index, cmd, m_compute_commands, debug_scope);
 
         #endregion
     }
@@ -1300,13 +1299,15 @@ bool debug_scope
 {
     #region Fields
 
+    private FCommandRender render_cmd = render_cmd;
     private ShaderPipeline? m_current_pipeline;
     private ShaderBinding? m_current_binding;
     private bool m_disposed;
     private bool m_has_pixel_shader;
     private bool m_has_vertex_shader;
     private bool m_has_mesh_shader;
     private bool m_has_task_shader;
+    private bool m_has_uav_writes;
 
     #endregion
 
@@ -1327,6 +1328,7 @@ public void Dispose()
                 "There is still Debug scope not ended, please check whether Dispose is missed."
             );
         ref var info = ref Info;
+        info.HasUavWrites = m_has_uav_writes;
         if (self.AutoBarrierEnabled)
         {
             var stages = m_has_pixel_shader ? FShaderStageFlags.Pixel : FShaderStageFlags.None;
@@ -1353,9 +1355,8 @@ public void Dispose()
                 );
             }
         }
+        render_cmd.CommandCount = (uint)m_commands.Count - render_cmd.CommandStartIndex;
         self.m_commands.Add(new() { Render = render_cmd });
-        Info.CommandCount = (uint)m_commands.Count - render_cmd.CommandStartIndex;
-        self.m_render_commands.Add(new() { Type = FCommandType.End });
         self.m_in_render_or_compute_scope = false;
         if (debug_scope) new DebugScope(self).Dispose();
     }
@@ -1686,13 +1687,14 @@ public void DispatchMesh(
 public unsafe struct ComputeScope(
     CommandList self,
     int info_index,
-    int cmd_index,
+    FCommandCompute compute_cmd,
     List<FComputeCommandItem> m_commands,
     bool debug_scope
 ) : IDisposable
 {
     #region Fields
 
+    private FCommandCompute compute_cmd = compute_cmd;
     private ShaderPipeline? m_current_pipeline;
     private ShaderBinding? m_current_binding;
     private bool m_disposed;
@@ -1715,8 +1717,8 @@ public void Dispose()
             throw new InvalidOperationException(
                 "There is still Debug scope not ended, please check whether Dispose is missed."
             );
-        Info.CommandCount = (uint)m_commands.Count - (uint)cmd_index;
-        self.m_compute_commands.Add(new() { Type = FCommandType.End });
+        compute_cmd.CommandCount = (uint)m_commands.Count - compute_cmd.CommandStartIndex;
+        self.m_commands.Add(new() { Compute = compute_cmd });
         self.m_in_render_or_compute_scope = false;
         if (debug_scope) new DebugScope(self).Dispose();
     }

Coplt.Graphics.Core/Native/Native.cs

@@ -2661,7 +2661,6 @@ public partial struct FResState
     public enum FCommandType : uint
     {
         None,
-        End,
         Label,
         BeginScope,
         EndScope,
@@ -2691,7 +2690,7 @@ public enum FResourceRefType : byte
 
     public unsafe partial struct FResourceMeta
     {
-        [NativeTypeName("__AnonymousRecord_Command_L62_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L60_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [NativeTypeName("Coplt::FResourceRefType")]
@@ -2860,7 +2859,7 @@ public partial struct FBarrier
         [NativeTypeName("Coplt::FBarrierType")]
         public FBarrierType Type;
 
-        [NativeTypeName("__AnonymousRecord_Command_L168_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L166_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [UnscopedRef]
@@ -3047,9 +3046,6 @@ public enum FStoreOp : byte
 
     public partial struct FRenderInfo
     {
-        [NativeTypeName("Coplt::u32")]
-        public uint CommandCount;
-
         [NativeTypeName("Coplt::FResourceRef")]
         public FResourceRef Dsv;
 
@@ -3083,6 +3079,9 @@ public partial struct FRenderInfo
         [NativeTypeName("FStoreOp[8]")]
         public _RtvStoreOp_e__FixedBuffer RtvStoreOp;
 
+        [NativeTypeName("Coplt::b8")]
+        public B8 HasUavWrites;
+
         [InlineArray(8)]
         public partial struct _Rtv_e__FixedBuffer
         {
@@ -3128,8 +3127,6 @@ public partial struct _RtvStoreOp_e__FixedBuffer
 
     public partial struct FComputeInfo
     {
-        [NativeTypeName("Coplt::u32")]
-        public uint CommandCount;
     }
 
     public partial struct FBufferRange
@@ -3356,6 +3353,9 @@ public partial struct FCommandRender
 
         [NativeTypeName("Coplt::u32")]
         public uint CommandStartIndex;
+
+        [NativeTypeName("Coplt::u32")]
+        public uint CommandCount;
     }
 
     [NativeTypeName("struct FCommandCompute : Coplt::FCommandBase")]
@@ -3368,6 +3368,9 @@ public partial struct FCommandCompute
 
         [NativeTypeName("Coplt::u32")]
         public uint CommandStartIndex;
+
+        [NativeTypeName("Coplt::u32")]
+        public uint CommandCount;
     }
 
     [NativeTypeName("struct FCommandSetPipeline : Coplt::FCommandBase")]
@@ -3465,7 +3468,7 @@ public partial struct FCommandDispatch
 
     public partial struct FCommandItem
     {
-        [NativeTypeName("__AnonymousRecord_Command_L490_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L489_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [UnscopedRef]
@@ -3663,7 +3666,7 @@ public partial struct __pad_e__FixedBuffer
 
     public partial struct FRenderCommandItem
     {
-        [NativeTypeName("__AnonymousRecord_Command_L518_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L517_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [UnscopedRef]
@@ -3833,7 +3836,7 @@ public partial struct __pad_e__FixedBuffer
 
     public partial struct FComputeCommandItem
     {
-        [NativeTypeName("__AnonymousRecord_Command_L541_C9")]
+        [NativeTypeName("__AnonymousRecord_Command_L540_C9")]
         public _Anonymous_e__Union Anonymous;
 
         [UnscopedRef]

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

@@ -11,8 +11,6 @@ namespace Coplt
     enum class FCommandType : u32
     {
         None,
-        // Render / Compute
-        End,
 
         Label,
         BeginScope,
@@ -266,7 +264,6 @@ namespace Coplt
 
     struct FRenderInfo
     {
-        u32 CommandCount{};
         // 可选
         FResourceRef Dsv{};
         u32 NumRtv{};
@@ -280,11 +277,11 @@ namespace Coplt
         FStoreOp DsvStoreOp[2]{};
         FLoadOp RtvLoadOp[8]{};
         FStoreOp RtvStoreOp[8]{};
+        b8 HasUavWrites{};
     };
 
     struct FComputeInfo
     {
-        u32 CommandCount{};
     };
 
     struct FBufferRange
@@ -418,13 +415,15 @@ namespace Coplt
         // 类型为 FRenderInfo
         u32 InfoIndex{};
         u32 CommandStartIndex{};
+        u32 CommandCount{};
     };
 
     struct FCommandCompute : FCommandBase
     {
         // 类型为 FComputeInfo
         u32 InfoIndex{};
         u32 CommandStartIndex{};
+        u32 CommandCount{};
     };
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////

Coplt.Graphics.Native/D3d12/CMakeLists.txt

@@ -51,7 +51,7 @@ add_library(${target_name} SHARED
 set_target_properties(${target_name} PROPERTIES LINKER_LANGUAGE CXX)
 set_target_properties(${target_name} PROPERTIES OUTPUT_NAME "Coplt.Graphics.Native.D3d12")
 add_library(Coplt::Graphics::D3d12 ALIAS ${target_name})
-target_compile_definitions(${target_name} PRIVATE -DFFI_SRC -DNOMINMAX)
+target_compile_definitions(${target_name} PRIVATE -DFFI_SRC -DNOMINMAX -DUSE_PIX)
 target_include_directories(${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/WinPixEventRuntime/Include/WinPixEventRuntime)
 
 set(BUILD_XAUDIO_WIN10 OFF)

Coplt.Graphics.Native/D3d12/Include/PipelineState.h

@@ -236,4 +236,24 @@ namespace Coplt
             return D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
         }
     }
+
+    inline D3D12_RESOLVE_MODE ToDx(const FResolveMode value)
+    {
+        switch (value)
+        {
+        case FResolveMode::Decompress:
+            return D3D12_RESOLVE_MODE_DECOMPRESS;
+            break;
+        case FResolveMode::Min:
+            return D3D12_RESOLVE_MODE_MIN;
+            break;
+        case FResolveMode::Max:
+            return D3D12_RESOLVE_MODE_MAX;
+            break;
+        case FResolveMode::Average:
+            return D3D12_RESOLVE_MODE_AVERAGE;
+            break;
+        }
+        return D3D12_RESOLVE_MODE_DECOMPRESS;
+    }
 }