AstralTech/Gryphn
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean it up a lil more

Browse Source
This commit is contained in:
Greg Wells
2025-06-08 17:28:34 -04:00
parent ffdde93ed2
commit 64d97e4e20
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rendering_api/vulkan/src/buffers/vulkan_buffer.c
View File

@@ -15,22 +15,21 @@ VkBufferUsageFlags vkGryphnBufferType(gnBufferType type) {
} }
gnReturnCode VkCreateBuffer( gnReturnCode VkCreateBuffer(
VkGryphnBuffer* buffer, gnBufferInfo info, VkGryphnBuffer* buffer, size_t size, gnDevice device,
VkDevice device, VkPhysicalDevice physcialDevice,
VkMemoryPropertyFlags flags, VkBufferUsageFlags usage VkMemoryPropertyFlags flags, VkBufferUsageFlags usage
) { ) {
VkBufferCreateInfo bufferInfo = { VkBufferCreateInfo bufferInfo = {
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
.size = info.size, .size = size,
.usage = usage, .usage = usage,
.sharingMode = VK_SHARING_MODE_EXCLUSIVE .sharingMode = VK_SHARING_MODE_EXCLUSIVE
}; };
if (vkCreateBuffer(device, &bufferInfo, NULL, &buffer->buffer) != VK_SUCCESS) if (vkCreateBuffer(device->outputDevice->device, &bufferInfo, NULL, &buffer->buffer) != VK_SUCCESS)
return GN_FAILED_TO_CREATE_BUFFER; return GN_FAILED_TO_CREATE_BUFFER;
VkMemoryRequirements bufferRequirements; VkMemoryRequirements bufferRequirements;
vkGetBufferMemoryRequirements(device, buffer->buffer, &bufferRequirements); vkGetBufferMemoryRequirements(device->outputDevice->device, buffer->buffer, &bufferRequirements);
VkMemoryAllocateInfo memoryAllocateInfo = { VkMemoryAllocateInfo memoryAllocateInfo = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
@@ -38,7 +37,7 @@ gnReturnCode VkCreateBuffer(
}; };
VkPhysicalDeviceMemoryProperties memoryProperties; VkPhysicalDeviceMemoryProperties memoryProperties;
vkGetPhysicalDeviceMemoryProperties(physcialDevice, &memoryProperties); vkGetPhysicalDeviceMemoryProperties(device->physicalDevice.physicalDevice->device, &memoryProperties);
gnBool foundMemory = gnFalse; gnBool foundMemory = gnFalse;
for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; i++) { for (uint32_t i = 0; i < memoryProperties.memoryTypeCount; i++) {
@@ -49,10 +48,9 @@ gnReturnCode VkCreateBuffer(
} // this whole thing was adapted from vulkan-tutorial.com } // this whole thing was adapted from vulkan-tutorial.com
if (!foundMemory) return GN_FAILED_TO_ALLOCATE_MEMORY; if (!foundMemory) return GN_FAILED_TO_ALLOCATE_MEMORY;
if (vkAllocateMemory(device, &memoryAllocateInfo, NULL, &buffer->memory) != VK_SUCCESS) { if (vkAllocateMemory(device->outputDevice->device, &memoryAllocateInfo, NULL, &buffer->memory) != VK_SUCCESS)
return GN_FAILED_TO_ALLOCATE_MEMORY; return GN_FAILED_TO_ALLOCATE_MEMORY;
} vkBindBufferMemory(device->outputDevice->device, buffer->buffer, buffer->memory, 0);
vkBindBufferMemory(device, buffer->buffer, buffer->memory, 0);
return GN_SUCCESS; return GN_SUCCESS;
} }
@@ -99,21 +97,21 @@ gnReturnCode gnCreateBufferFn(gnBufferHandle buffer, gnOutputDeviceHandle device
buffer->buffer->useStagingBuffer = gnTrue; buffer->buffer->useStagingBuffer = gnTrue;
VkCreateBuffer( VkCreateBuffer(
&buffer->buffer->stagingBuffer, &buffer->buffer->stagingBuffer,
info, device->outputDevice->device, device->physicalDevice.physicalDevice->device, info.size, device,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
VK_BUFFER_USAGE_TRANSFER_SRC_BIT VK_BUFFER_USAGE_TRANSFER_SRC_BIT
); );
return VkCreateBuffer( return VkCreateBuffer(
&buffer->buffer->buffer, &buffer->buffer->buffer,
info, device->outputDevice->device, device->physicalDevice.physicalDevice->device, info.size, device,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
vkGryphnBufferType(info.type) | VK_BUFFER_USAGE_TRANSFER_DST_BIT vkGryphnBufferType(info.type) | VK_BUFFER_USAGE_TRANSFER_DST_BIT
); );
} else { } else {
return VkCreateBuffer( return VkCreateBuffer(
&buffer->buffer->buffer, &buffer->buffer->buffer,
info, device->outputDevice->device, device->physicalDevice.physicalDevice->device, info.size, device,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
vkGryphnBufferType(info.type) vkGryphnBufferType(info.type)
); );

3
rendering_api/vulkan/src/buffers/vulkan_buffer.h
View File

@@ -17,7 +17,6 @@ struct gnPlatformBuffer_t {
}; };
gnReturnCode VkCreateBuffer( gnReturnCode VkCreateBuffer(
VkGryphnBuffer*, gnBufferInfo info, VkGryphnBuffer* buffer, size_t size, gnDevice device,
VkDevice device, VkPhysicalDevice physcialDevice,
VkMemoryPropertyFlags flags, VkBufferUsageFlags usage VkMemoryPropertyFlags flags, VkBufferUsageFlags usage
); );