Bindings support mapping and unmapping of buffers

Author: deccer

src/EngineKit/Native/OpenGL/GL.Enums.cs

@@ -159,7 +159,7 @@ public enum BufferUsage : uint
     }
 
     [Flags]
-    public enum BufferStorageMask : uint
+    public enum BufferStorageFlags : uint
     {
         MapReadBit = 1,
         MapWriteBit = 2,
@@ -1012,7 +1012,20 @@ public enum MemoryAccess : uint
         WriteOnly = 0x88B9,
         ReadWrite = 0x88BA
     }
-    
+
+    [Flags]
+    public enum MapFlags : uint
+    {
+        Read = 0x0001,
+        Write = 0x0002,
+        InvalidateRange = 0x0004,
+        InvalidateBuffer = 0x0008,
+        FlushExplicit = 0x0010,
+        UnSynchronized = 0x0020,
+        Persistent = 0x0040,
+        Coherent = 0x0080
+    }
+
     public enum ClipControlOrigin : uint
     {
         LowerLeft = 36001,

src/EngineKit/Native/OpenGL/GL.Native.cs

@@ -121,7 +121,7 @@ public static unsafe partial class GL
     private static delegate* unmanaged<float, void> _glLineWidthDelegate = &glLineWidth;
     private static delegate* unmanaged<LogicOperation, void> _glLogicOpDelegate = &glLogicOp;
 
-    private static delegate* unmanaged<uint, long, void*, BufferStorageMask, void> _glNamedBufferStorageDelegate =
+    private static delegate* unmanaged<uint, long, void*, uint, void> _glNamedBufferStorageDelegate =
         &glNamedBufferStorage;
 
     private static delegate* unmanaged<uint, nint, void*, BufferUsage, void> _glNamedBufferDataDelegate =
@@ -258,7 +258,8 @@ public static unsafe partial class GL
     private static delegate* unmanaged<uint, float*, void> _glGetFloatvDelegate = &glGetFloatv;
     private static delegate* unmanaged<uint, uint, byte*> _glGetStringiDelegate = &glGetStringi;
 
-    private static delegate* unmanaged<int, MemoryAccess, void*> _glMapNamedBufferDelegate = &glMapNamedBuffer;
+    private static delegate* unmanaged<uint, MemoryAccess, void*> _glMapNamedBufferDelegate = &glMapNamedBuffer;
+    private static delegate* unmanaged<uint, int> _glUnmapNamedBufferDelegate = &glUnmapNamedBuffer;
 
     private static delegate* unmanaged<uint, int, int, byte, int, MemoryAccess, SizedInternalFormat, void> _glBindImageTextureDelegate = &glBindImageTexture;
     private static delegate* unmanaged<uint, int, int*, void> _glBindImageTexturesDelegate = &glBindImageTextures;
@@ -974,12 +975,12 @@ private static void glNamedBufferStorage(
         uint buffer,
         long size,
         void* dataPtr,
-        BufferStorageMask bufferStorageMask)
+        uint bufferStorageFlags)
     {
         _glNamedBufferStorageDelegate =
-            (delegate* unmanaged<uint, long, void*, BufferStorageMask, void>)Glfw.Glfw.GetProcAddress(
+            (delegate* unmanaged<uint, long, void*, uint, void>)Glfw.Glfw.GetProcAddress(
                 nameof(glNamedBufferStorage));
-        _glNamedBufferStorageDelegate(buffer, size, dataPtr, bufferStorageMask);
+        _glNamedBufferStorageDelegate(buffer, size, dataPtr, bufferStorageFlags);
     }
 
     [UnmanagedCallersOnly]
@@ -1738,11 +1739,18 @@ private static void glGetBooleanv(uint parameterName, byte* data)
     }
 
     [UnmanagedCallersOnly]
-    private static void* glMapNamedBuffer(int buffer, MemoryAccess memoryAccess)
+    private static void* glMapNamedBuffer(uint buffer, MemoryAccess memoryAccess)
     {
-        _glMapNamedBufferDelegate = (delegate* unmanaged<int, MemoryAccess, void*>)Glfw.Glfw.GetProcAddress(nameof(glMapNamedBuffer));
+        _glMapNamedBufferDelegate = (delegate* unmanaged<uint, MemoryAccess, void*>)Glfw.Glfw.GetProcAddress(nameof(glMapNamedBuffer));
         return _glMapNamedBufferDelegate(buffer, memoryAccess);
     }
+
+    [UnmanagedCallersOnly]
+    private static int glUnmapNamedBuffer(uint buffer)
+    {
+        _glUnmapNamedBufferDelegate = (delegate* unmanaged<uint, int>)Glfw.Glfw.GetProcAddress(nameof(glUnmapNamedBuffer));
+        return _glUnmapNamedBufferDelegate(buffer);
+    }
 
     [UnmanagedCallersOnly]
     private static void glClipControl(ClipControlOrigin origin, ClipControlDepth depth)

src/EngineKit/Native/OpenGL/GL.cs

@@ -585,45 +585,45 @@ public static void NamedBufferStorage(
         uint buffer,
         long size,
         nint data,
-        BufferStorageMask bufferStorageMask)
+        uint bufferStorageFlags)
     {
         var dataPtr = (void*)data;
-        NamedBufferStorage(buffer, size, dataPtr, bufferStorageMask);
+        NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
     }
 
     public static void NamedBufferStorage<TData>(
         uint buffer,
         in TData data,
-        BufferStorageMask bufferStorageMask)
+        uint bufferStorageFlags)
         where TData : unmanaged
     {
         var size = (long)sizeof(TData);
         fixed (void* dataPtr = &data)
         {
-            NamedBufferStorage(buffer, size, dataPtr, bufferStorageMask);
+            NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
         }
     }
 
     public static void NamedBufferStorage<TData>(
         uint buffer,
         TData[] data,
-        BufferStorageMask bufferStorageMask)
+        uint bufferStorageFlags)
         where TData : unmanaged
     {
         var size = (long)(data.Length * sizeof(TData));
         fixed (void* dataPtr = data)
         {
-            NamedBufferStorage(buffer, size, dataPtr, bufferStorageMask);
+            NamedBufferStorage(buffer, size, dataPtr, bufferStorageFlags);
         }
     }
 
     private static void NamedBufferStorage(
         uint buffer,
         long size,
         void* dataPtr,
-        BufferStorageMask bufferStorageMask)
+        uint bufferStorageFlags)
     {
-        _glNamedBufferStorageDelegate(buffer, size, dataPtr, bufferStorageMask);
+        _glNamedBufferStorageDelegate(buffer, size, dataPtr, bufferStorageFlags);
     }
 
     public static void NamedBufferSubData<TData>(
@@ -1554,4 +1554,14 @@ private static bool IsValidImageTextureFormat(SizedInternalFormat format)
             _ => false
         };
     }
+
+    public static void* MapBuffer(uint buffer, MemoryAccess memoryAccess)
+    {
+        return _glMapNamedBufferDelegate(buffer, memoryAccess);
+    }
+
+    public static bool UnmapBuffer(uint buffer)
+    {
+        return _glUnmapNamedBufferDelegate(buffer) == 1;
+    }
 }