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

improve vulkan uniform layout generation

Browse Source
This commit is contained in:
Greg Wells
2025-07-03 12:07:02 -04:00
parent cfedb49569
commit d9937c2833
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/apis/vulkan/src/uniforms/vulkan_uniform_layout.c
View File

@@ -4,6 +4,7 @@
VkDescriptorType vkGryphnUniformType(gnUniformType type) {
switch(type) {
case GN_UNIFORM_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
case GN_SHADER_STORE_BUFFER_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
case GN_IMAGE_DESCRIPTOR: return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
case GN_UNIFORM_TYPE_MAX: return VK_DESCRIPTOR_TYPE_MAX_ENUM;
}

28
projects/apis/vulkan/src/uniforms/vulkan_uniform_pool.c
View File

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