TMP / Fixed vulkan_texture_descriptors.cpp

This commit is contained in:
OLEGSHA 2023-03-27 22:47:49 +02:00
parent 66349560d4
commit 2c45f519fb

View File

@ -15,7 +15,7 @@ void TextureDescriptors::allocatePool() {
poolInfo.pPoolSizes = &poolSize; poolInfo.pPoolSizes = &poolSize;
poolInfo.maxSets = POOL_SIZE; poolInfo.maxSets = POOL_SIZE;
auto output = &pools[pools.size() - 1]; auto *output = &pools[pools.size() - 1];
vulkan.handleVkResult( vulkan.handleVkResult(
"Could not create texture descriptor pool", "Could not create texture descriptor pool",
vkCreateDescriptorPool(vulkan.getDevice(), &poolInfo, nullptr, output)); vkCreateDescriptorPool(vulkan.getDevice(), &poolInfo, nullptr, output));
@ -24,7 +24,7 @@ void TextureDescriptors::allocatePool() {
} }
TextureDescriptors::TextureDescriptors(Vulkan &vulkan) TextureDescriptors::TextureDescriptors(Vulkan &vulkan)
: DescriptorSetInterface(SET_NUMBER, vulkan) { : DescriptorSetInterface(SET_NUMBER, vulkan), lastPoolCapacity(0) {
VkDescriptorSetLayoutCreateInfo layoutInfo{}; VkDescriptorSetLayoutCreateInfo layoutInfo{};
layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
@ -47,7 +47,7 @@ TextureDescriptors::TextureDescriptors(Vulkan &vulkan)
} }
TextureDescriptors::~TextureDescriptors() { TextureDescriptors::~TextureDescriptors() {
for (auto pool : pools) { for (auto *pool : pools) {
vkDestroyDescriptorPool(vulkan.getDevice(), pool, nullptr); vkDestroyDescriptorPool(vulkan.getDevice(), pool, nullptr);
} }
@ -71,7 +71,7 @@ VkDescriptorSet TextureDescriptors::addTexture(VkImageView view,
allocInfo.descriptorSetCount = 1; allocInfo.descriptorSetCount = 1;
allocInfo.pSetLayouts = &layout; allocInfo.pSetLayouts = &layout;
VkDescriptorSet descriptorSet; VkDescriptorSet descriptorSet = nullptr;
vulkan.handleVkResult("Could not create texture descriptor set", vulkan.handleVkResult("Could not create texture descriptor set",
vkAllocateDescriptorSets(vulkan.getDevice(), vkAllocateDescriptorSets(vulkan.getDevice(),
&allocInfo, &descriptorSet)); &allocInfo, &descriptorSet));