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

textures with VMA

Browse Source
This commit is contained in:
Gregory Wells
2025-08-12 14:27:08 -04:00
parent 88aa38adbf
commit b0db5bfd22
2 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
projects/apis/vulkan/src/textures/vulkan_texture.c
View File

@@ -143,18 +143,10 @@ void VkCopyBufferToImage(VkGryphnBuffer buffer, VkGryphnImage image, gnExtent3D
gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureInfo info) { gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureInfo info) {
texture->texture = malloc(sizeof(struct gnPlatformTexture_t)); texture->texture = malloc(sizeof(struct gnPlatformTexture_t));
size_t imageSize = info.extent.width * info.extent.height; size_t imageSize = info.extent.width * info.extent.height;
if (info.format == GN_FORMAT_BGRA8_SRGB) { imageSize *= 4; } if (info.format == GN_FORMAT_BGRA8_SRGB) { imageSize *= 4; }
if (info.format == GN_FORMAT_RGBA8_SRGB) { imageSize *= 4; } if (info.format == GN_FORMAT_RGBA8_SRGB) { imageSize *= 4; }
gnReturnCode staginBufferCreateCode = VkCreateBuffer(
&texture->texture->buffer, imageSize, device,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, VK_BUFFER_USAGE_TRANSFER_SRC_BIT
);
if (staginBufferCreateCode != GN_SUCCESS) return staginBufferCreateCode;
texture->texture->size = imageSize; texture->texture->size = imageSize;
VkImageCreateInfo imageInfo = { VkImageCreateInfo imageInfo = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
.sharingMode = VK_SHARING_MODE_EXCLUSIVE, .sharingMode = VK_SHARING_MODE_EXCLUSIVE,
@@ -172,27 +164,14 @@ gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureIn
.imageType = vkGryphnTextureType(info.type), .imageType = vkGryphnTextureType(info.type),
.format = vkGryphnFormatToVulkanFormat(info.format) .format = vkGryphnFormatToVulkanFormat(info.format)
}; };
VmaAllocationCreateInfo allocationInfo = {
VkResult res = vkCreateImage(device->outputDevice->device, &imageInfo, NULL, &texture->texture->image.image); .usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE,
if (res != VK_SUCCESS) return VkResultToGnReturnCode(res); .requiredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT
VkMemoryRequirements memRequirements;
vkGetImageMemoryRequirements(device->outputDevice->device, texture->texture->image.image, &memRequirements);
gnBool foundMemory = GN_FALSE;
VkMemoryAllocateInfo allocInfo = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.allocationSize = memRequirements.size,
.memoryTypeIndex = VkMemoryIndex(device->outputDevice->physicalDevice, memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &foundMemory)
}; };
if (!foundMemory) return GN_FAILED_TO_ALLOCATE_MEMORY; VkResult imageCreateInfo = vmaCreateImage(device->outputDevice->allocator, &imageInfo, &allocationInfo, &texture->texture->image.image, &texture->texture->image.allocation, NULL);
if (imageCreateInfo != VK_SUCCESS) return VkResultToGnReturnCode(imageCreateInfo);
VkResult allocationRes = vkAllocateMemory(device->outputDevice->device, &allocInfo, NULL, &texture->texture->image.memory);
if (allocationRes != VK_SUCCESS) return VkResultToGnReturnCode(allocationRes);
vkBindImageMemory(device->outputDevice->device, texture->texture->image.image, texture->texture->image.memory, 0);
texture->texture->beenWrittenToo = GN_FALSE; texture->texture->beenWrittenToo = GN_FALSE;
VkImageViewCreateInfo viewInfo = { VkImageViewCreateInfo viewInfo = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.image = texture->texture->image.image, .image = texture->texture->image.image,
@@ -242,28 +221,37 @@ gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureIn
} }
void textureData(gnTextureHandle texture, void* pixelData) { void textureData(gnTextureHandle texture, void* pixelData) {
void* data;
vkMapMemory(texture->device->outputDevice->device, texture->texture->buffer.memory, 0, texture->texture->size, 0, &data);
memcpy(data, pixelData, texture->texture->size);
vkUnmapMemory(texture->device->outputDevice->device, texture->texture->buffer.memory);
//gnDevice device, VkImage image, VkFormat format, VkImageLayout oldLayout, VkImageLayout newLayout
VkTransitionImageLayout(texture->device, texture->texture->image.image, texture->info.format, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL); VkTransitionImageLayout(texture->device, texture->texture->image.image, texture->info.format, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
VkCopyBufferToImage(texture->texture->buffer, texture->texture->image, texture->info.extent, texture->device);
VkTransitionImageLayout(texture->device, texture->texture->image.image, texture->info.format, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
void* textureData;
VkGryphnBuffer* stagingBuffer = &texture->device->outputDevice->stagingBuffer;
VkDeviceSize sizeLeft = texture->texture->size, dataSize = texture->texture->size;
while (sizeLeft > 0) {
VkDeviceSize chunkSize = (texture->device->outputDevice->stagingBufferSize < sizeLeft) ? texture->device->outputDevice->stagingBufferSize : sizeLeft;
vulkanMapBufferInternal(texture->device, *stagingBuffer, &textureData);
memcpy(textureData, (char*)pixelData + (dataSize - sizeLeft), chunkSize);
vulkanUnmapBufferInternal(texture->device, *stagingBuffer);
VkBufferCopy copyRegion = {
.srcOffset = 0,
.dstOffset = dataSize - sizeLeft,
.size = chunkSize
};
sizeLeft -= chunkSize;
VkCopyBufferToImage(texture->device->outputDevice->stagingBuffer, texture->texture->image, texture->info.extent, texture->device);
}
VkTransitionImageLayout(texture->device, texture->texture->image.image, texture->info.format, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
texture->texture->beenWrittenToo = GN_TRUE; texture->texture->beenWrittenToo = GN_TRUE;
} }
void gnDestroyVulkanImage(VkGryphnImage* image, VkDevice device) { void gnDestroyVulkanImage(VkGryphnImage* image, gnDevice device) {
vkDestroyImage(device, image->image, NULL); vmaDestroyImage(device->outputDevice->allocator, image->image, image->allocation);
vkDestroyImageView(device, image->imageView, NULL); vkDestroyImageView(device->outputDevice->device, image->imageView, NULL);
vkFreeMemory(device, image->memory, NULL);
} }
void destroyTexture(gnTexture texture) { void destroyTexture(gnTexture texture) {
vkDestroySampler(texture->device->outputDevice->device, texture->texture->sampler, NULL); vkDestroySampler(texture->device->outputDevice->device, texture->texture->sampler, NULL);
gnDestroyVulkanImage(&texture->texture->image, texture->device);
gnDestroyVulkanBuffer(&texture->texture->buffer, texture->device->outputDevice->device);
gnDestroyVulkanImage(&texture->texture->image, texture->device->outputDevice->device);
} }

9
projects/apis/vulkan/src/textures/vulkan_texture.h
View File

@@ -2,21 +2,22 @@
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include "textures/gryphn_texture.h" #include "textures/gryphn_texture.h"
#include "buffers/vulkan_buffer.h" #include "buffers/vulkan_buffer.h"
#include "memory_allocator/vk_mem_alloc.h"
typedef struct VkGryphnImage { typedef struct VkGryphnImage {
VkImage image; VkImage image;
VkDeviceMemory memory; VmaAllocation allocation;
VkImageView imageView; VkImageView imageView;
} VkGryphnImage; } VkGryphnImage;
void gnDestroyVulkanImage(VkGryphnImage* image, VkDevice device); void gnDestroyVulkanImage(VkGryphnImage* image, gnDevice device);
typedef struct gnPlatformTexture_t { typedef struct gnPlatformTexture_t {
VkGryphnBuffer buffer;
VkGryphnImage image; VkGryphnImage image;
VkSampler sampler; VkSampler sampler;
size_t size; size_t size;
gnBool beenWrittenToo; gnBool beenWrittenToo;
VkImageLayout currentLayout;
} gnPlatformTexture; } gnPlatformTexture;
gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureInfo info); gnReturnCode createTexture(gnTexture texture, gnDevice device, const gnTextureInfo info);