LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 10:13:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: better api use of descriptor pools

Browse Source 
Some implementations allow for bottomless pools,
which never run out of pool memory.
This new implementation allows for this case to happen.
This commit is contained in:
niki
2023-07-25 16:37:53 +02:00
parent e08ade86b5
commit f30bf9bee0
2 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Shader.cpp
+35 -32
View File
@@ -141,7 +141,7 @@ static const TBuiltInResource defaultTBuiltInResource = {
};
static const uint32_t STREAMBUFFER_DEFAULT_SIZE = 16;
static const uint32_t DESCRIPTOR_POOL_SIZE = 1;
static const uint32_t DESCRIPTOR_POOL_SIZE = 16;
class BindingMapper
{
@@ -315,9 +315,6 @@ void Shader::unloadVolatile()
vkDestroyPipeline(device, computePipeline, nullptr);
});
while (!freeDescriptorSets.empty())
freeDescriptorSets.pop();
for (const auto streamBuffer : streamBuffers)
streamBuffer->release();
@@ -1102,42 +1099,48 @@ void Shader::setMainTex(graphics::Texture *texture)
}
}
VkDescriptorPool Shader::createDescriptorPool()
{
VkDescriptorPoolCreateInfo createInfo{};
createInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
createInfo.maxSets = DESCRIPTOR_POOL_SIZE;
createInfo.poolSizeCount = static_cast<uint32_t>(descriptorPoolSizes.size());
createInfo.pPoolSizes = descriptorPoolSizes.data();
VkDescriptorPool pool;
if (vkCreateDescriptorPool(device, &createInfo, nullptr, &pool) != VK_SUCCESS)
throw love::Exception("failed to create descriptor pool");
descriptorPools.push_back(pool);
}
VkDescriptorSet Shader::allocateDescriptorSet()
{
if (freeDescriptorSets.empty())
if (descriptorPools.empty())
createDescriptorPool();
while (true)
{
VkDescriptorPoolCreateInfo createInfo{};
createInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
createInfo.maxSets = DESCRIPTOR_POOL_SIZE;
createInfo.poolSizeCount = static_cast<uint32_t>(descriptorPoolSizes.size());
createInfo.pPoolSizes = descriptorPoolSizes.data();
VkDescriptorPool pool;
if (vkCreateDescriptorPool(device, &createInfo, nullptr, &pool) != VK_SUCCESS)
throw love::Exception("failed to create descriptor pool");
descriptorPools.push_back(pool);
std::vector<VkDescriptorSetLayout> layouts(DESCRIPTOR_POOL_SIZE, descriptorSetLayout);
VkDescriptorSetAllocateInfo allocInfo{};
allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
allocInfo.descriptorPool = pool;
allocInfo.descriptorSetCount = DESCRIPTOR_POOL_SIZE;
allocInfo.pSetLayouts = layouts.data();
allocInfo.descriptorPool = descriptorPools.back();
allocInfo.descriptorSetCount = 1;
allocInfo.pSetLayouts = &descriptorSetLayout;
std::vector<VkDescriptorSet> descriptorSet;
descriptorSet.resize(DESCRIPTOR_POOL_SIZE);
VkResult result = vkAllocateDescriptorSets(device, &allocInfo, descriptorSet.data());
if (result != VK_SUCCESS)
VkDescriptorSet descriptorSet;
VkResult result = vkAllocateDescriptorSets(device, &allocInfo, &descriptorSet);
switch (result)
{
case VK_SUCCESS:
return descriptorSet;
case VK_ERROR_OUT_OF_POOL_MEMORY:
createDescriptorPool();
continue;
default:
throw love::Exception("failed to allocate descriptor set");
for (const auto ds : descriptorSet)
freeDescriptorSets.push(ds);
}
}
auto ds = freeDescriptorSets.front();
freeDescriptorSets.pop();
return ds;
}
} // vulkan
src/modules/graphics/vulkan/Shader.h
+2 -7
View File
@@ -97,12 +97,8 @@ private:
void createPipelineLayout();
void createDescriptorPoolSizes();
void createStreamBuffers();
void buildLocalUniforms(
spirv_cross::Compiler &comp,
const spirv_cross::SPIRType &type,
size_t baseoff,
const std::string &basename);
void buildLocalUniforms(spirv_cross::Compiler &comp, const spirv_cross::SPIRType &type, size_t baseoff, const std::string &basename);
VkDescriptorPool createDescriptorPool();
VkDescriptorSet allocateDescriptorSet();
VkDeviceSize uniformBufferSizeAligned;
@@ -117,7 +113,6 @@ private:
// we keep a vector of stream buffers that gets dynamically increased if more memory is needed
std::vector<StreamBuffer*> streamBuffers;
std::vector<VkDescriptorPool> descriptorPools;
std::queue<VkDescriptorSet> freeDescriptorSets;
std::vector<std::vector<VkDescriptorSet>> descriptorSetsVector;
std::vector<VkPipelineShaderStageCreateInfo> shaderStages;