Continue working on RHI

Ghost.Graphics/Data/Material.cs

@@ -1,5 +1,5 @@
 using Ghost.Graphics.D3D12;
-using Ghost.Graphics.Shading;
+using Ghost.Graphics.RHI;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using Win32.Graphics.Direct3D12;
@@ -12,10 +12,11 @@ namespace Ghost.Graphics.Data;
 public unsafe class Material : IDisposable
 {
     private readonly CBufferCache[] _cbufferCaches;
-    private readonly List<Texture2D> _textures = new();
 
     private bool _disposed;
 
+    internal ReadOnlySpan<CBufferCache> CBufferCaches => _cbufferCaches;
+
     public Shader Shader
     {
         get; set;
@@ -129,23 +130,12 @@ public unsafe class Material : IDisposable
         SetMatrix(Shader.GetPropertyId(propertyName), in value);
     }
 
-    /// <summary>
-    /// Adds a bindless texture to the material and returns its index
-    /// </summary>
-    /// <param name="texture">The bindless texture to add</param>
-    /// <returns>The index of the texture in the material's texture list</returns>
-    public int AddTexture(Texture2D texture)
-    {
-        _textures.Add(texture);
-        return _textures.Count - 1;
-    }
-
     /// <summary>
     /// Sets a texture index for a shader property (for bindless texture access)
     /// </summary>
     /// <param name="propertyName">The name of the shader property (e.g., "_TextureIndex1")</param>
     /// <param name="texture">The bindless texture to reference</param>
-    public void SetTextureIndex(string propertyName, Texture2D texture)
+    public void SetTexture(string propertyName, Texture2D texture)
     {
         SetUInt(propertyName, texture.DescriptorIndex);
     }
@@ -156,18 +146,14 @@ public unsafe class Material : IDisposable
     /// <param name="mesh">The mesh whose buffer indices to set</param>
     /// <param name="vertexBufferIndexProperty">The name of the vertex buffer index property (e.g., "_VertexBufferIndex")</param>
     /// <param name="indexBufferIndexProperty">The name of the index buffer index property (e.g., "_IndexBufferIndex")</param>
-    public void SetMeshBufferIndices(Mesh mesh, string vertexBufferIndexProperty = "_VertexBufferIndex", string indexBufferIndexProperty = "_IndexBufferIndex")
+    public void SetMeshBuffer(Mesh mesh, string vertexBufferIndexProperty = "_VertexBufferIndex", string indexBufferIndexProperty = "_IndexBufferIndex")
     {
         SetUInt(vertexBufferIndexProperty, mesh.VertexBufferDescriptorIndex);
         SetUInt(indexBufferIndexProperty, mesh.IndexBufferDescriptorIndex);
     }
 
-    /// <summary>
-    /// Gets all textures used by this material
-    /// </summary>
-    public IReadOnlyList<Texture2D> Textures => _textures;
-
-    private unsafe void WriteToCache<T>(int propertyId, in T value) where T : unmanaged
+    private unsafe void WriteToCache<T>(int propertyId, in T value)
+        where T : unmanaged
     {
         if (propertyId == -1)
         {
@@ -177,7 +163,7 @@ public unsafe class Material : IDisposable
         var propInfo = Shader.Properties[propertyId];
         if (propInfo.Size != sizeof(T))
         {
-            throw new ArgumentException($"Property '{propInfo.Name}' has a size mismatch. Expected {sizeof(T)} bytes, but got {propInfo.Size} bytes.");
+            throw new ArgumentException($"Property '{propInfo.Name}' has a size mismatch. Expected {propInfo.Size} bytes, but got {sizeof(T)} bytes.");
         }
 
         var cache = _cbufferCaches[propInfo.CBufferIndex];
@@ -196,37 +182,6 @@ public unsafe class Material : IDisposable
         }
     }
 
-    /// <summary>
-    /// Binds the material for bindless rendering
-    /// </summary>
-    /// <param name="cmd">Command list to bind to</param>
-    internal void Bind(CommandList cmd)
-    {
-        var commandList = cmd.NativeCommandList.Ptr;
-
-        // Set root signature and pipeline state
-        commandList->SetGraphicsRootSignature(Shader.RootSignature);
-        commandList->SetPipelineState(Shader.PipelineState);
-
-        // Set descriptor heaps - CRUCIAL: Use the specialized bindless heap for SM 6.6
-        var heaps = stackalloc ID3D12DescriptorHeap*[2];
-        heaps[0] = GraphicsPipeline.DescriptorAllocator.GetBindlessHeap().Ptr; // Specialized bindless heap
-        heaps[1] = Shader.SamplerHeap.Ptr; // Sampler heap from shader
-        commandList->SetDescriptorHeaps(2, heaps);
-
-        // Bind constant buffers
-        var rootParamIndex = 0u;
-        foreach (var cbufferInfo in Shader.ConstantBuffers)
-        {
-            var cache = _cbufferCaches[cbufferInfo.RegisterSlot];
-            commandList->SetGraphicsRootConstantBufferView(rootParamIndex++, cache.GpuResource.GPUAddress);
-        }
-
-        // Bind sampler descriptor table (last root parameter)
-        var samplerGpuHandle = Shader.SamplerHeap.Ptr->GetGPUDescriptorHandleForHeapStart();
-        commandList->SetGraphicsRootDescriptorTable(rootParamIndex, samplerGpuHandle);
-    }
-
     public void Dispose()
     {
         if (_disposed)