From 03328638b1f55befe9ed33e562171efd4e435e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 8 Oct 2023 13:37:48 +0200 Subject: [PATCH] Typo fix, reorder --- Common/GPU/Vulkan/VulkanDescSet.cpp | 8 ++++---- Common/GPU/Vulkan/VulkanRenderManager.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanDescSet.cpp b/Common/GPU/Vulkan/VulkanDescSet.cpp index 0139a2356a..299c8a6018 100644 --- a/Common/GPU/Vulkan/VulkanDescSet.cpp +++ b/Common/GPU/Vulkan/VulkanDescSet.cpp @@ -26,14 +26,14 @@ void VulkanDescSetPool::Create(VulkanContext *vulkan, const BindingType *binding case BindingType::STORAGE_IMAGE_COMPUTE: storageImageCount++; break; } } - if (storageImageCount) { - sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, storageImageCount * descriptorCount }); + if (combinedImageSamplerCount) { + sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, combinedImageSamplerCount * descriptorCount }); } if (uniformBufferDynamicCount) { sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, uniformBufferDynamicCount * descriptorCount }); } - if (combinedImageSamplerCount) { - sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, combinedImageSamplerCount * descriptorCount }); + if (storageBufferCount) { + sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, storageBufferCount * descriptorCount }); } if (storageImageCount) { sizes_.push_back(VkDescriptorPoolSize{ VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, storageImageCount * descriptorCount }); diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h index 353dd5e7e2..1883db2f9f 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.h +++ b/Common/GPU/Vulkan/VulkanRenderManager.h @@ -257,7 +257,7 @@ public: // WARNING: desc must stick around during the lifetime of the pipeline! It's not enough to build it on the stack and drop it. VKRGraphicsPipeline *CreateGraphicsPipeline(VKRGraphicsPipelineDesc *desc, PipelineFlags pipelineFlags, uint32_t variantBitmask, VkSampleCountFlagBits sampleCount, bool cacheLoad, const char *tag); VKRComputePipeline *CreateComputePipeline(VKRComputePipelineDesc *desc); - + VKRPipelineLayout *CreatePipelineLayout(VkPipelineLayout pipelineLayout, VkDescriptorSetLayout descSetLayout) { VKRPipelineLayout *layout = new VKRPipelineLayout(); layout->pipelineLayout = pipelineLayout;