add support for storage buffers in vulkan

projects/apis/vulkan/loader/vulkan_device_loader.c

@@ -41,6 +41,7 @@ gnDeviceFunctions loadVulkanDeviceFunctions() {
 
         ._gnCreateBuffer = createBuffer,
         ._gnBufferData = bufferData,
+        ._gnBufferSubData = vulkanBufferSubData,
         ._gnMapBuffer = mapBuffer,
         ._gnDestroyBuffer = destroyBuffer,
 
@@ -49,6 +50,7 @@ gnDeviceFunctions loadVulkanDeviceFunctions() {
         ._gnDestroyUniformPool = destroyUniformPool,
 
         ._gnUpdateBufferUniform = updateBufferUniform,
+        ._gnUpdateStorageUniform = updateVulkanStorageUniform,
         ._gnUpdateImageUniform = updateImageUniform,
 
         ._gnCreateTexture = createTexture,

projects/apis/vulkan/src/buffers/vulkan_buffer.c

@@ -11,6 +11,7 @@ VkBufferUsageFlags vkGryphnBufferType(gnBufferType type) {
     case GN_VERTEX_BUFFER: usageFlags |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; break;
     case GN_INDEX_BUFFER: usageFlags |= VK_BUFFER_USAGE_INDEX_BUFFER_BIT; break;
     case GN_UNIFORM_BUFFER: usageFlags |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; break;
+    case GN_STORAGE_BUFFER: usageFlags |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; break;
     }
     return usageFlags;
 }
@@ -114,6 +115,22 @@ void bufferData(gnBufferHandle buffer, size_t dataSize, void* data) {
         vkUnmapMemory(buffer->device->outputDevice->device, buffer->buffer->buffer.memory);
     }
 }
+void vulkanBufferSubData(gnBufferHandle buffer, size_t offset, size_t dataSize, void* data) {
+    void* bufferData;
+    if (buffer->buffer->useStagingBuffer) {
+        vkMapMemory(buffer->device->outputDevice->device, buffer->buffer->stagingBuffer.memory, 0, dataSize, 0, &bufferData);
+        memcpy(bufferData + offset, data, dataSize);
+        vkUnmapMemory(buffer->device->outputDevice->device, buffer->buffer->stagingBuffer.memory);
+        VkCopyBuffer(
+            buffer->buffer->stagingBuffer.buffer, buffer->buffer->buffer.buffer, dataSize,
+            buffer->device->outputDevice->transferCommandPool, buffer->device->outputDevice->device,
+            buffer->device->outputDevice->transferQueue);
+    } else {
+        vkMapMemory(buffer->device->outputDevice->device, buffer->buffer->buffer.memory, 0, dataSize, 0, &bufferData);
+        memcpy(bufferData + offset, data, dataSize);
+        vkUnmapMemory(buffer->device->outputDevice->device, buffer->buffer->buffer.memory);
+    }
+}
 void* mapBuffer(gnBufferHandle buffer) {
     void* data;
     vkMapMemory(buffer->device->outputDevice->device, buffer->buffer->buffer.memory, 0, buffer->info.size, 0, &data);

projects/apis/vulkan/src/buffers/vulkan_buffer.h

@@ -25,5 +25,6 @@ uint32_t VkMemoryIndex(VkPhysicalDevice device, uint32_t memoryType, VkMemoryPro
 
 gnReturnCode createBuffer(gnBufferHandle buffer, gnOutputDeviceHandle device, gnBufferInfo info);
 void bufferData(gnBufferHandle buffer, size_t dataSize, void* data);
+void vulkanBufferSubData(gnBufferHandle buffer, size_t offset, size_t dataSize, void* data);
 void* mapBuffer(gnBufferHandle buffer);
 void destroyBuffer(gnBufferHandle buffer);

projects/apis/vulkan/src/uniforms/vulkan_uniform.c

@@ -24,6 +24,26 @@ void updateBufferUniform(gnUniform uniform, gnBufferUniformInfo* info) {
     vkUpdateDescriptorSets(uniform->pool->device->outputDevice->device, 1, &write, 0, NULL);
 }
 
+void updateVulkanStorageUniform(gnUniform uniform, gnStorageUniformInfo* info) {
+    VkDescriptorBufferInfo bufferInfo = {
+        .buffer = info->buffer->buffer->buffer.buffer,
+        .offset = info->offset,
+        .range = info->size
+    };
+
+    VkWriteDescriptorSet write = {
+        .sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET,
+        .descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+        .descriptorCount = 1,
+        .pBufferInfo = &bufferInfo,
+        .dstSet = uniform->uniform->set,
+        .dstBinding = info->binding,
+        .dstArrayElement = 0
+    };
+
+    vkUpdateDescriptorSets(uniform->pool->device->outputDevice->device, 1, &write, 0, NULL);
+}
+
 void updateImageUniform(gnUniform uniform, gnImageUniformInfo* info) {
     VkDescriptorImageInfo imageInfo = {
         .imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,

projects/apis/vulkan/src/uniforms/vulkan_uniform.h

@@ -7,4 +7,5 @@ typedef struct gnPlatformUniform_t {
 } gnPlatformUniform;
 
 void updateBufferUniform(gnUniform uniform, gnBufferUniformInfo* info);
+void updateVulkanStorageUniform(gnUniform uniform, gnStorageUniformInfo* info);
 void updateImageUniform(gnUniform uniform, gnImageUniformInfo* info);

projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c

@@ -50,26 +50,26 @@ gnUniform* allocateUniforms(gnUniformPool pool, gnUniformAllocationInfo allocInf
         };
 
         // TODO: redo this, its not warning me IDK why cuz its totally wrong
-        VkDescriptorPoolSize poolSizes[GN_UNIFORM_TYPE_MAX];
+        VkDescriptorPoolSize poolSizes[GN_UNIFORM_TYPE_MAX] = { };
-        for (int i = 0; i < allocInfo.setCount; i++) {
+        for (int i = 0; i < allocInfo.setCount; i++)
-            for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++) {
+            for (int c = 0; c < allocInfo.sets[i].uniformBindingCount; c++)
                 poolSizes[allocInfo.sets[i].uniformBindings[c].type].descriptorCount++;
-            }
-        }
 
         uint32_t count = 0;
-        VkDescriptorPoolSize realPoolSize[GN_UNIFORM_TYPE_MAX] = {};
+        VkDescriptorPoolSize realPoolSizes[GN_UNIFORM_TYPE_MAX] = {};
 
         for (int i = 0; i < GN_UNIFORM_TYPE_MAX; i++) {
-            if (poolSizes[i].descriptorCount <= 0) continue;
+            poolSizes[i].type = vkGryphnUniformType(i);
-            realPoolSize[count] = poolSizes[i];
+            if (poolSizes[i].descriptorCount > 0) {
+                realPoolSizes[count] = poolSizes[i];
                 count++;
             }
+        }
 
         VkDescriptorPoolCreateInfo poolInfo = {
             .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
             .poolSizeCount = count,
-            .pPoolSizes = realPoolSize,
+            .pPoolSizes = realPoolSizes,
             .maxSets = allocInfo.setCount
         };
 

projects/core/src/buffers/gryphn_buffer.c

@@ -11,6 +11,9 @@ gnReturnCode gnCreateBuffer(gnBufferHandle* buffer, gnOutputDeviceHandle device,
 void gnBufferData(gnBufferHandle buffer, size_t dataSize, void* data) {
     buffer->device->instance->callingLayer->deviceFunctions._gnBufferData(buffer, dataSize, data);
 }
+void gnBufferSubData(gnBufferHandle buffer, size_t offset, size_t dataSize, gnBufferMemory data) {
+    buffer->device->instance->callingLayer->deviceFunctions._gnBufferSubData(buffer, offset, dataSize, data);
+}
 void* gnMapBuffer(gnBufferHandle buffer) {
     if (buffer->info.usage == GN_STATIC_DRAW) return NULL;
     return buffer->device->instance->callingLayer->deviceFunctions._gnMapBuffer(buffer);

projects/core/src/buffers/gryphn_buffer.h

@@ -11,7 +11,8 @@ typedef enum gnIndexType {
 typedef enum gnBufferType {
     GN_VERTEX_BUFFER  = 0x00000001,
     GN_INDEX_BUFFER   = 0x00000002,
-    GN_UNIFORM_BUFFER = 0x00000004
+    GN_UNIFORM_BUFFER = 0x00000004,
+    GN_STORAGE_BUFFER = 0x00000008
 } gnBufferType;
 
 typedef enum gnBufferUsage {
@@ -37,5 +38,6 @@ GN_ARRAY_LIST(gnBufferMemory);
 
 gnReturnCode gnCreateBuffer(gnBufferHandle* buffer, gnOutputDeviceHandle device, gnBufferInfo info);
 void gnBufferData(gnBufferHandle buffer, size_t dataSize, gnBufferMemory data);
+void gnBufferSubData(gnBufferHandle buffer, size_t offset, size_t dataSize, gnBufferMemory data);
 gnBufferMemory gnMapBuffer(gnBufferHandle buffer);
 void gnDestroyBuffer(gnBufferHandle buffer);

projects/core/src/uniforms/gryphn_uniform.c

@@ -7,6 +7,10 @@ void gnUpdateBufferUniform(gnUniform uniform, gnBufferUniformInfo bufferInfo) {
     uniform->pool->device->instance->callingLayer->deviceFunctions._gnUpdateBufferUniform(uniform, &bufferInfo);
 }
 
+void gnUpdateStorageUniform(gnUniform uniform, gnStorageUniformInfo storageInfo) {
+    uniform->pool->device->instance->callingLayer->deviceFunctions._gnUpdateStorageUniform(uniform, &storageInfo);
+}
+
 void gnUpdateImageUniform(gnUniform uniform, gnImageUniformInfo imageInfo) {
     uniform->pool->device->instance->callingLayer->deviceFunctions._gnUpdateImageUniform(uniform, &imageInfo);
 }

projects/core/src/uniforms/gryphn_uniform.h

@@ -11,6 +11,12 @@ typedef struct gnBufferUniformInfo {
     size_t size;
 } gnBufferUniformInfo;
 
+typedef struct gnStorageUniformInfo {
+    gnBuffer buffer;
+    size_t offset, size;
+    uint32_t binding;
+} gnStorageUniformInfo;
+
 typedef struct gnImageUniformInfo {
     uint32_t binding;
     gnTexture texture;
@@ -22,7 +28,8 @@ struct gnUniform_t {
     gnUniformPool pool;
 };
 #endif
-GN_ARRAY_LIST(gnUniform)
+GN_ARRAY_LIST(gnUniform);
 
 void gnUpdateBufferUniform(gnUniform uniform, gnBufferUniformInfo bufferInfo);
+void gnUpdateStorageUniform(gnUniform uniform, gnStorageUniformInfo storageInfo);
 void gnUpdateImageUniform(gnUniform uniform, gnImageUniformInfo imageInfo);

projects/core/src/uniforms/gryphn_uniform_layout.h

@@ -4,8 +4,8 @@
 
 typedef enum gnUniformType {
     GN_UNIFORM_BUFFER_DESCRIPTOR,
-    GN_SHADER_STORE_BUFFER_DESCRIPTOR,
     GN_IMAGE_DESCRIPTOR,
+    GN_SHADER_STORE_BUFFER_DESCRIPTOR,
     GN_UNIFORM_TYPE_MAX
 } gnUniformType;
 

projects/loader/src/gryphn_device_functions.h

@@ -13,6 +13,7 @@ typedef struct gnCommandPoolInfo gnCommandPoolInfo;
 typedef struct gnBufferInfo gnBufferInfo;
 typedef struct gnUniformAllocationInfo gnUniformAllocationInfo;
 typedef struct gnBufferUniformInfo gnBufferUniformInfo;
+typedef struct gnStorageUniformInfo gnStorageUniformInfo;
 typedef struct gnImageUniformInfo gnImageUniformInfo;
 typedef struct gnTextureInfo gnTextureInfo;
 typedef struct gnSubmitInfo gnSubmitInfo;
@@ -43,6 +44,7 @@ typedef struct gnDeviceFunctions {
 
     gnReturnCode (*_gnCreateBuffer)(gnBufferHandle buffer, gnDeviceHandle device, gnBufferInfo info);
     void (*_gnBufferData)(gnBufferHandle buffer, size_t size, void* data);
+    void (*_gnBufferSubData)(gnBufferHandle buffer, size_t offset, size_t dataSize, void* data);
     void* (*_gnMapBuffer)(gnBufferHandle buffer);
     void (*_gnDestroyBuffer)(gnBufferHandle buffer);
 
@@ -51,6 +53,7 @@ typedef struct gnDeviceFunctions {
     void (*_gnDestroyUniformPool)(gnUniformPool pool);
 
     void (*_gnUpdateBufferUniform)(gnUniform uniform, gnBufferUniformInfo* bufferInfo);
+    void (*_gnUpdateStorageUniform)(gnUniform uniform, gnStorageUniformInfo* storageInfo);
     void (*_gnUpdateImageUniform)(gnUniform uniform, gnImageUniformInfo* imageInfo);
 
     gnReturnCode (*_gnCreateTexture)(gnTexture texture, gnDevice device, const gnTextureInfo info);

projects/validation_layers/function_loader/loader/function_loader.c

@@ -63,6 +63,7 @@ gnDeviceFunctions loadFunctionLoaderDeviceFunctions() {
 
         ._gnCreateBuffer = checkCreateBuffer,
         ._gnBufferData = checkBufferData,
+        ._gnBufferSubData = checkBufferSubData,
         ._gnMapBuffer = checkMapBuffer,
         ._gnDestroyBuffer = checkDestroyBuffer,
 
@@ -71,6 +72,7 @@ gnDeviceFunctions loadFunctionLoaderDeviceFunctions() {
         ._gnDestroyUniformPool = checkDestroyUniformPool,
 
         ._gnUpdateBufferUniform = checkUpdateBufferUniform,
+        ._gnUpdateStorageUniform = checkUpdateStorageUniform,
         ._gnUpdateImageUniform = checkUpdateImageUniform,
 
         ._gnCreateTexture = checkCreateTexture,

projects/validation_layers/function_loader/src/device_functions.c

@@ -110,6 +110,9 @@ gnReturnCode checkCreateBuffer(gnBufferHandle buffer, gnDeviceHandle device, gnB
 void checkBufferData(gnBufferHandle buffer, size_t size, void* data) {
     CHECK_VOID_FUNCTION(buffer->device->instance, _gnBufferData, buffer, size, data);
 }
+void checkBufferSubData(gnBufferHandle buffer, size_t offset, size_t size, void* data) {
+    CHECK_VOID_FUNCTION(buffer->device->instance, _gnBufferSubData, buffer, offset, size, data);
+}
 void* checkMapBuffer(gnBufferHandle buffer) {
     loaderLayer* nextLayer = loaderGetNextLayer(buffer->device->instance);
     if (nextLayer->deviceFunctions._gnMapBuffer == NULL) {
@@ -146,6 +149,9 @@ void checkDestroyUniformPool(gnUniformPool pool) {
 void checkUpdateBufferUniform(gnUniform uniform, gnBufferUniformInfo* bufferInfo) {
     CHECK_VOID_FUNCTION(uniform->pool->device->instance, _gnUpdateBufferUniform, uniform, bufferInfo);
 }
+void checkUpdateStorageUniform(gnUniform uniform, gnStorageUniformInfo* storageInfo) {
+    CHECK_VOID_FUNCTION(uniform->pool->device->instance, _gnUpdateStorageUniform, uniform, storageInfo);
+}
 void checkUpdateImageUniform(gnUniform uniform, gnImageUniformInfo* imageInfo) {
     CHECK_VOID_FUNCTION(uniform->pool->device->instance, _gnUpdateImageUniform, uniform, imageInfo);
 }

projects/validation_layers/function_loader/src/device_functions.h

@@ -24,6 +24,7 @@ void checkDestroySemaphore(gnSemaphoreHandle semaphore);
 
 gnReturnCode checkCreateBuffer(gnBufferHandle buffer, gnDeviceHandle device, gnBufferInfo info);
 void checkBufferData(gnBufferHandle buffer, size_t size, void* data);
+void checkBufferSubData(gnBufferHandle buffer, size_t offset, size_t size, void* data);
 void* checkMapBuffer(gnBufferHandle buffer);
 void checkDestroyBuffer(gnBufferHandle buffer);
 
@@ -32,6 +33,7 @@ gnUniform* checkUniformPoolAllocateUniforms(gnUniformPool pool, gnUniformAllocat
 void checkDestroyUniformPool(gnUniformPool pool);
 
 void checkUpdateBufferUniform(gnUniform uniform, gnBufferUniformInfo* bufferInfo);
+void checkUpdateStorageUniform(gnUniform uniform, gnStorageUniformInfo* storageInfo);
 void checkUpdateImageUniform(gnUniform uniform, gnImageUniformInfo* imageInfo);
 
 gnReturnCode checkCreateTexture(gnTexture texture, gnDevice device, const gnTextureInfo info);