Merge branch 'dev'

Author: 2A5F

.idea/inspectionProfiles/Project_Default.xml

@@ -15,6 +15,11 @@ public enum DispatchType : byte
     Mesh,
 }
 
+internal interface ISubCommandList
+{
+    void OnSyncBinding(uint index);
+}
+
 /// <summary>
 /// 命令列表，不支持多线程访问
 /// </summary>
@@ -327,9 +332,11 @@ public bool SetBinding(CommandList self, ShaderBinding Binding)
     internal readonly Dictionary<object, int> m_resources = new();
     internal readonly Dictionary<FResourceRef, ScopedState> m_scoped_res_state = new();
     internal readonly HashSet<object> m_objects = new();
+    internal readonly HashSet<ShaderBinding> m_bindings = new();
     internal GpuOutput? m_current_output;
-    internal uint m_grow_cbv_srv_uav_binding_capacity;
-    internal uint m_grow_sampler_binding_capacity;
+    internal uint m_sync_binding_count;
+    internal uint m_growing_resource_binding_capacity;
+    internal uint m_growing_sampler_binding_capacity;
     internal int m_debug_scope_count;
     internal int m_render_debug_scope_count;
     internal int m_compute_debug_scope_count;
@@ -385,11 +392,13 @@ internal void Reset()
         m_string16.Clear();
         m_resources.Clear();
         m_objects.Clear();
-        m_grow_cbv_srv_uav_binding_capacity = 0;
-        m_grow_sampler_binding_capacity = 0;
+        m_bindings.Clear();
+        m_current_output = null;
+        m_sync_binding_count = 0;
+        m_growing_resource_binding_capacity = 0;
+        m_growing_sampler_binding_capacity = 0;
         m_current_barrier_cmd_index = -1;
         m_auto_barrier = true;
-        m_current_output = null;
     }
 
     #endregion
@@ -444,8 +453,9 @@ internal void BuildSubmitStruct(GpuExecutor Executor, bool NoWait)
                 Str16 = p_string16,
                 CommandCount = (uint)m_commands.Count,
                 ResourceCount = (uint)m_resource_metas.Count,
-                GrowCbvSrvUavBindingCapacity = m_grow_cbv_srv_uav_binding_capacity,
-                GrowSamplerBindingCapacity = m_grow_sampler_binding_capacity,
+                SyncBindingCount = m_sync_binding_count,
+                GrowingResourceBindingCapacity = m_growing_resource_binding_capacity,
+                GrowingSamplerBindingCapacity = m_growing_sampler_binding_capacity,
             };
             Queue.ActualSubmit(Executor, &submit, NoWait);
         }
@@ -1315,7 +1325,7 @@ public ComputeScope Compute(string? Name = null, ReadOnlySpan<byte> Name8 = defa
     /// <summary>
     /// 必须在 Render 或者 Compute 范围内使用
     /// </summary>
-    internal void SyncBinding(ref PipelineContext context)
+    internal void SyncBinding<L>(ref PipelineContext context, in L list) where L : ISubCommandList
     {
         var binding = context.CurrentBinding;
         if (binding == null) return;
@@ -1387,18 +1397,45 @@ internal void SyncBinding(ref PipelineContext context)
         if (!(context.PipelineChanged || context.BindingChanged)) return;
         context.PipelineChanged = false;
         context.BindingChanged = false;
-        if (binding.Changed)
+        var first = m_bindings.Add(binding);
+        list.OnSyncBinding(m_sync_binding_count++);
+        if (first)
         {
             var layout = binding.Layout;
-            foreach (var (c, g) in binding.m_changed_groups)
+            for (var c = 0u; c < layout.NativeGroupClasses.Length; c++)
             {
                 ref readonly var @class = ref layout.NativeGroupClasses[(int)c];
-                ref readonly var group = ref @class.InfoSpan[(int)g];
-                if (group.View is FShaderLayoutGroupView.Sampler) m_grow_sampler_binding_capacity += group.Size;
-                else m_grow_cbv_srv_uav_binding_capacity += group.Size;
+                for (var g = 0u; g < @class.InfoSpan.Length; g++)
+                {
+                    SyncBindingItem(binding, layout, c, g, first);
+                }
             }
             binding.ApplyChange();
         }
+        else if (binding.Changed)
+        {
+            var layout = binding.Layout;
+            foreach (var (c, g) in binding.m_changed_groups)
+            {
+                SyncBindingItem(binding, layout, c, g, first);
+            }
+            binding.ApplyChange();
+        }
+    }
+
+    private void SyncBindingItem(ShaderBinding binding, ShaderLayout layout, uint c, uint g, bool first)
+    {
+        ref readonly var @class = ref layout.NativeGroupClasses[(int)c];
+        ref readonly var group = ref @class.InfoSpan[(int)g];
+        if (@class.Scope != FShaderLayoutGroupScope.Persist) goto Add;
+        if (!first) goto Add;
+        var changed = binding.m_changed_groups.Contains((c, g));
+        if (changed) goto Add;
+        return;
+    Add:
+        if (@class.Sampler) m_growing_sampler_binding_capacity += group.Size;
+        else m_growing_resource_binding_capacity += group.Size;
+        return;
     }
 
     #endregion
@@ -1571,7 +1608,7 @@ public unsafe struct RenderScope(
     FCommandRender render_cmd,
     List<FRenderCommandItem> m_commands,
     bool debug_scope
-) : IDisposable
+) : IDisposable, ISubCommandList
 {
     #region Fields
 
@@ -1931,7 +1968,7 @@ public void Draw(
                 throw new ArgumentException("Only shaders with a vertex stage can use Draw");
         }
         if (Binding != null) SetBinding(Binding);
-        self.SyncBinding(ref m_context);
+        self.SyncBinding(ref m_context, this);
         var cmd = new FCommandDraw
         {
             Base = { Type = FCommandType.Draw },
@@ -1975,7 +2012,7 @@ public void DispatchMesh(
                 throw new ArgumentException("Only shaders with a mesh stage can use DispatchMesh");
         }
         if (Binding != null) SetBinding(Binding);
-        self.SyncBinding(ref m_context);
+        self.SyncBinding(ref m_context, this);
         var cmd = new FCommandDispatch
         {
             Base = { Type = FCommandType.Draw },
@@ -1991,6 +2028,20 @@ public void DispatchMesh(
     }
 
     #endregion
+
+    #region OnSyncBinding
+
+    void ISubCommandList.OnSyncBinding(uint index)
+    {
+        var cmd = new FCommandSyncBinding
+        {
+            Base = { Type = FCommandType.SyncBinding },
+            Index = index,
+        };
+        m_commands.Add(new() { SyncBinding = cmd });
+    }
+
+    #endregion
 }
 
 #endregion
@@ -2003,7 +2054,7 @@ public unsafe struct ComputeScope(
     FCommandCompute compute_cmd,
     List<FComputeCommandItem> m_commands,
     bool debug_scope
-) : IDisposable
+) : IDisposable, ISubCommandList
 {
     #region Fields
 
@@ -2238,7 +2289,7 @@ public void Dispatch(
                 throw new ArgumentException("Only Compute shaders can use Dispatch");
             m_has_compute_shader = true;
         }
-        self.SyncBinding(ref m_context);
+        self.SyncBinding(ref m_context, this);
         var cmd = new FCommandDispatch
         {
             Base = { Type = FCommandType.SetBinding },
@@ -2257,6 +2308,20 @@ public void Dispatch(
     }
 
     #endregion
+
+    #region OnSyncBinding
+
+    void ISubCommandList.OnSyncBinding(uint index)
+    {
+        var cmd = new FCommandSyncBinding
+        {
+            Base = { Type = FCommandType.SyncBinding },
+            Index = index,
+        };
+        m_commands.Add(new() { SyncBinding = cmd });
+    }
+
+    #endregion
 }
 
 #endregion

Coplt.Graphics.Core/Core/CommandList.cs

@@ -17,7 +17,6 @@ public sealed unsafe partial class ShaderBinding : IQueueOwned
     internal readonly GpuQueue m_queue;
     internal readonly ShaderLayout m_layout;
     internal readonly View[] m_views;
-    internal readonly HashSet<uint> m_changed_items = new();
     internal readonly HashSet<(uint c, uint g)> m_changed_groups = new();
 
     #endregion
@@ -31,7 +30,7 @@ public sealed unsafe partial class ShaderBinding : IQueueOwned
     public ReadOnlySpan<View> Views => m_views;
     internal Span<View> MutViews => m_views;
     public ref readonly View this[int index] => ref m_views[index];
-    internal bool Changed => m_changed_items.Count != 0 || m_changed_groups.Count != 0;
+    internal bool Changed => m_changed_groups.Count != 0;
 
     #endregion
 
@@ -114,7 +113,6 @@ internal void Set(ReadOnlySpan<ShaderBindingSetItem> Items, Span<FBindItem> dst)
             };
             ref var view = ref views[(int)src.Index];
             view = src.View;
-            m_changed_items.Add(src.Index);
             if (info.Place is FShaderLayoutItemPlace.Grouped)
             {
                 m_changed_groups.Add((info.Class, info.Group));
@@ -128,7 +126,6 @@ internal void Set(ReadOnlySpan<ShaderBindingSetItem> Items, Span<FBindItem> dst)
 
     internal void ApplyChange()
     {
-        m_changed_items.Clear();
         m_changed_groups.Clear();
     }
 

Coplt.Graphics.Core/Core/ShaderBinding.cs

@@ -42,15 +42,15 @@ public enum ShaderLayoutItemType : byte
 public enum ShaderLayoutItemUsage : byte
 {
     /// <summary>
-    /// 一般改变频率的变量，可能每帧都会改变
+    /// 动态变量，每帧都可能会改变
     /// </summary>
-    Common,
+    Dynamic,
     /// <summary>
-    /// 不太改变的变量，例如材质参数，一般很少改变，可以进行一定的静态优化，建议将所有材质绑定放到单独的 space 中区分
+    /// 持久变量，例如材质参数，一般很少改变，可以进行一定的静态优化，建议将所有材质绑定放到单独的 space 中区分
     /// </summary>
-    Material,
+    Persist,
     /// <summary>
-    /// 经常改变的变量，例如每次绘制调用都会改变, dx 后端将直接在根签名内，类型是 Sampler 时表示是静态采样器
+    /// 即时变量，例如每次绘制调用都会改变, dx 后端将直接在根签名内，类型是 Sampler 时表示是静态采样器，不支持纹理
     /// </summary>
     Instant,
 }