Add span overloads

deccer · Dec 8, 2023 · ed2b34b · ed2b34b
1 parent 869663d
commit ed2b34b
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 33 deletions.
diff --git a/src/EngineKit/Graphics/Buffer.cs b/src/EngineKit/Graphics/Buffer.cs
@@ -82,6 +82,16 @@ public void Update<TElement>(TElement[] data, int elementOffset = 0)
         }
         GL.NamedBufferSubData(Id, elementOffset * Stride, data);
     }
+
+    public void Update<TElement>(Span<TElement> data, int elementOffset = 0)
+        where TElement : unmanaged
+    {
+        if ((elementOffset * Stride) + data.Length * Stride > SizeInBytes)
+        {
+            throw new ArgumentOutOfRangeException(nameof(elementOffset));
+        }
+        GL.NamedBufferSubData(Id, elementOffset * Stride, data);
+    }
 
     public static implicit operator uint(Buffer buffer)
     {

diff --git a/src/EngineKit/Graphics/IBuffer.cs b/src/EngineKit/Graphics/IBuffer.cs
@@ -22,9 +22,12 @@ void AllocateStorage<TElement>(TElement[] elements, StorageAllocationFlags stora
 
     void Update(nint dataPtr, int offsetInBytes, int sizeInBytes);
 
-    void Update<T>(T item, int elementOffset = 0)
-        where T : unmanaged;
+    void Update<TElement>(TElement item, int elementOffset = 0)
+        where TElement : unmanaged;
 
-    void Update<T>(T[] data, int elementOffset = 0)
-        where T : unmanaged;
+    void Update<TElement>(TElement[] data, int elementOffset = 0)
+        where TElement : unmanaged;
+
+    void Update<TElement>(Span<TElement> data, int elementOffset = 0)
+        where TElement : unmanaged;    
 }
diff --git a/src/EngineKit/Native/OpenGL/GL.cs b/src/EngineKit/Native/OpenGL/GL.cs
@@ -591,26 +591,26 @@ public static void NamedBufferStorage(
         NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
     }
 
-    public static void NamedBufferStorage<TData>(
+    public static void NamedBufferStorage<TElement>(
         uint buffer,
-        in TData data,
+        in TElement data,
         uint bufferStorageFlags)
-        where TData : unmanaged
+        where TElement : unmanaged
     {
-        var size = (long)sizeof(TData);
+        var size = (long)sizeof(TElement);
         fixed (void* dataPtr = &data)
         {
             NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
         }
     }
 
-    public static void NamedBufferStorage<TData>(
+    public static void NamedBufferStorage<TElement>(
         uint buffer,
-        TData[] data,
+        TElement[] data,
         uint bufferStorageFlags)
-        where TData : unmanaged
+        where TElement : unmanaged
     {
-        var size = (long)(data.Length * sizeof(TData));
+        var size = (long)(data.Length * sizeof(TElement));
         fixed (void* dataPtr = data)
         {
             NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
@@ -626,26 +626,39 @@ private static void NamedBufferStorage(
         _glNamedBufferStorageDelegate(buffer, size, dataPtr, bufferStorageFlags);
     }
 
-    public static void NamedBufferSubData<TData>(
+    public static void NamedBufferSubData<TElement>(
         uint buffer,
         nint offset,
-        TData[] data)
-        where TData : unmanaged
+        TElement[] data)
+        where TElement : unmanaged
     {
-        var size = (long)(data.Length * sizeof(TData));
+        var size = (long)(data.Length * sizeof(TElement));
         fixed (void* dataPtr = data)
         {
             NamedBufferSubData(buffer, offset, size, dataPtr);
         }
     }
+
+    public static void NamedBufferSubData<TElement>(
+        uint buffer,
+        nint offset,
+        Span<TElement> data)
+        where TElement : unmanaged
+    {
+        var size = (long)(data.Length * sizeof(TElement));
+        fixed (void* dataPtr = data)
+        {
+            NamedBufferSubData(buffer, offset, size, dataPtr);
+        }
+    }    
 
-    public static void NamedBufferSubData<TData>(
+    public static void NamedBufferSubData<TElement>(
         uint buffer,
         nint offset,
-        in TData data)
-        where TData : unmanaged
+        in TElement data)
+        where TElement : unmanaged
     {
-        var size = (long)sizeof(TData);
+        var size = (long)sizeof(TElement);
         fixed (void* dataPtr = &data)
         {
             NamedBufferSubData(buffer, offset, size, dataPtr);
@@ -658,7 +671,7 @@ public static void NamedBufferSubData(
         long size,
         void* data)
     {
-        _glNamedBufferSubDataDelegate(buffer, offset, size, (void*)data);
+        _glNamedBufferSubDataDelegate(buffer, offset, size, data);
     }
 
     public static void NamedBufferData(
@@ -671,41 +684,41 @@ public static void NamedBufferData(
         NamedBufferDataInternal(buffer, size, dataPtr, usage);
     }
 
-    public static void NamedBufferData<TData>(
+    public static void NamedBufferData<TElement>(
         uint buffer,
-        Span<TData> data,
+        Span<TElement> data,
         BufferUsage usage)
-        where TData : unmanaged
+        where TElement : unmanaged
     {
-        var size = (nint)(data.Length * sizeof(TData));
+        var size = (nint)(data.Length * sizeof(TElement));
         fixed (void* dataPtr = data)
         {
             NamedBufferDataInternal(buffer, size, dataPtr, usage);
         }
     }
 
-    public static void NamedBufferData<TData>(
+    public static void NamedBufferData<TElement>(
         uint buffer,
-        TData[] data,
+        TElement[] data,
         BufferUsage usage)
-        where TData : unmanaged
+        where TElement : unmanaged
     {
-        var size = (nint)(data.Length * sizeof(TData));
+        var size = (nint)(data.Length * sizeof(TElement));
         fixed (void* dataPtr = data)
         {
             NamedBufferDataInternal(buffer, size, dataPtr, usage);
         }
     }
 
-    public static void NamedBufferData<TData>(
+    public static void NamedBufferData<TElement>(
         uint buffer,
-        in TData data,
+        in TElement data,
         BufferUsage usage)
-        where TData : unmanaged
+        where TElement : unmanaged
     {
         fixed (void* dataPtr = &data)
         {
-            NamedBufferDataInternal(buffer, sizeof(TData), dataPtr, usage);
+            NamedBufferDataInternal(buffer, sizeof(TElement), dataPtr, usage);
         }
     }