diff --git a/vulkan.d b/vulkan.d index 049b054..83a1a6e 100644 --- a/vulkan.d +++ b/vulkan.d @@ -553,7 +553,7 @@ AllocDescSet(Vulkan* vk, DescSetLayout layout, u32 dynamic_count = 0) alloc_info.descriptorPool = vk.active_pool; result = vkAllocateDescriptorSets(vk.device, &alloc_info, &set.handle); - VkCheckA("vkAllocateDescriptorSets failure", result); // TODO: look more into how to handle this + VkCheckA("vkAllocateDescriptorSets failure", result); } return set; @@ -2158,14 +2158,15 @@ InitDescriptors(Vulkan* vk) void PushDescriptorPool(Vulkan* vk) { - VkDescriptorPoolSize[7] pool_sizes = [ - { type: VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, descriptorCount: 4096 }, - { type: VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, descriptorCount: 4096 }, + VkDescriptorPoolSize[8] pool_sizes = [ + { type: VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, descriptorCount: 4096 }, + { type: VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, descriptorCount: 4096 }, { type: VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, descriptorCount: 4096 }, - { type: VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, descriptorCount: 4096 }, + { type: VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, descriptorCount: 4096 }, { type: VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, descriptorCount: 4096 }, - { type: VK_DESCRIPTOR_TYPE_SAMPLER, descriptorCount: 4096 }, - { type: VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, descriptorCount: 4096 }, + { type: VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, descriptorCount: 4096 }, + { type: VK_DESCRIPTOR_TYPE_SAMPLER, descriptorCount: 4096 }, + { type: VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, descriptorCount: 4096 }, ]; VkDescriptorPoolCreateInfo pool_info = {