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

fix some jazz

Browse Source
This commit is contained in:
Greg Wells
2025-06-08 13:50:08 -04:00
parent 04808a14dd
commit 11d329c4d9
7 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rendering_api/vulkan/src/uniforms/vulkan_uniform_layout.h
View File

@@ -3,3 +3,4 @@
#include <core/uniforms/gryphn_uniform_layout.h>
VkDescriptorSetLayout* vkGryphnCreateSetLayouts(const gnUniformLayout* layout, uint32_t* setCount, VkDevice device);
VkDescriptorType vkGryphnUniformType(gnUniformType type);

38
rendering_api/vulkan/src/uniforms/vulkan_uniform_pool.c
View File

@@ -5,42 +5,50 @@
gnReturnCode gnCreateUniformPoolFn(gnUniformPool pool, gnDeviceHandle device) {
pool->uniformPool = malloc(sizeof(struct gnPlatformUniformPool_t));
pool->uniformPool->poolCount = pool->uniformPool->maxPoolCount = 1;
pool->uniformPool->pools = malloc(sizeof(VkDescriptorPool) * pool->uniformPool->maxPoolCount);
pool->uniformPool->poolCount = 0;
pool->uniformPool->maxPoolCount = 1;
pool->uniformPool->pools = malloc(sizeof(vkGryphnUniformPool) * pool->uniformPool->maxPoolCount);
return GN_SUCCESS;
}
gnUniform* gnUniformPoolAllocateUniformsFn(gnUniformPool pool, const gnUniformLayout layout) {
uint32_t setCount;
VkDescriptorSetLayout* layouts = vkGryphnCreateSetLayouts(&layout, &setCount, pool->device->outputDevice->device);
if (pool->uniformPool->poolCount >= pool->uniformPool->maxPoolCount) {
pool->uniformPool->maxPoolCount *= 2;
pool->uniformPool->pools = realloc(pool->uniformPool->pools, sizeof(vkGryphnUniformPool) * pool->uniformPool->maxPoolCount);
}
pool->uniformPool->pools[pool->uniformPool->poolCount].layouts = vkGryphnCreateSetLayouts(&layout, &pool->uniformPool->pools[pool->uniformPool->poolCount].layoutCount, pool->device->outputDevice->device);
VkDescriptorPoolSize* sizes = malloc(sizeof(VkDescriptorPoolSize) * layout.uniformBindingCount);
gnUniform* uniforms = malloc(sizeof(gnUniform) * setCount);
gnUniform* uniforms = malloc(sizeof(gnUniform) * pool->uniformPool->pools[pool->uniformPool->poolCount].layoutCount);
for (int i = 0; i < layout.uniformBindingCount; i++) {
sizes[i].type = vkGryphnUniformType(layout.uniformBindings[i].type);
sizes[i].descriptorCount = 1;
}
VkDescriptorPoolCreateInfo poolInfo = {
.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
.poolSizeCount = layout.uniformBindingCount,
.maxSets = layout.uniformBindingCount,
.pPoolSizes = sizes,
.maxSets = layout.uniformBindingCount,
};
if (pool->uniformPool->poolCount >= pool->uniformPool->maxPoolCount) {
pool->uniformPool->maxPoolCount *= 2;
pool->uniformPool->pools = realloc(pool->uniformPool->pools, sizeof(VkDescriptorPool) * pool->uniformPool->maxPoolCount);
}
if (vkCreateDescriptorPool(
pool->device->outputDevice->device, &poolInfo, NULL,
&pool->uniformPool->pools[pool->uniformPool->poolCount]
&pool->uniformPool->pools[pool->uniformPool->poolCount].pool
) != VK_SUCCESS)
return NULL;
pool->uniformPool->poolCount++;
free(layouts);
free(sizes);
return uniforms;
}
void gnDestroyUniformPoolFn(gnUniformPool pool) {
for (int i = 0; i < pool->uniformPool->poolCount; i++) {
for (int k = 0; k < pool->uniformPool->pools[i].layoutCount; k++)
vkDestroyDescriptorSetLayout(pool->device->outputDevice->device, pool->uniformPool->pools[i].layouts[k], NULL);
vkDestroyDescriptorPool(pool->device->outputDevice->device, pool->uniformPool->pools[i].pool, NULL);
}
free(pool->uniformPool);
}

9
rendering_api/vulkan/src/uniforms/vulkan_uniform_pool.h
View File

@@ -1,9 +1,14 @@
#pragma once
#include <vulkan/vulkan.h>
#include <core/uniforms/gryphn_uniform_pool.h>
#include "core/uniforms/gryphn_uniform_layout.h"
typedef struct vkGryphnUniformPool {
VkDescriptorPool pool;
uint32_t layoutCount;
VkDescriptorSetLayout* layouts;
} vkGryphnUniformPool;
struct gnPlatformUniformPool_t {
uint32_t poolCount, maxPoolCount;
VkDescriptorPool* pools;
vkGryphnUniformPool* pools;
};