VERY experimental Nintendo Switch 2 emulator
C++
vk_descriptor_pool: Disallow descriptor set free
GPUCode25bc2dbedb02
diff --git a/src/video_core/renderer_vulkan/vk_blit_screen.cpp b/src/video_core/renderer_vulkan/vk_blit_screen.cppindex ad3b29f0ee..31928bb94e 100644--- a/src/video_core/renderer_vulkan/vk_blit_screen.cpp+++ b/src/video_core/renderer_vulkan/vk_blit_screen.cpp@@ -566,7 +566,7 @@ void BlitScreen::CreateDescriptorPool() {const VkDescriptorPoolCreateInfo ci{.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,.pNext = nullptr,- .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,+ .flags = 0,.maxSets = static_cast<u32>(image_count),.poolSizeCount = static_cast<u32>(pool_sizes.size()),.pPoolSizes = pool_sizes.data(),@@ -576,7 +576,7 @@ void BlitScreen::CreateDescriptorPool() {const VkDescriptorPoolCreateInfo ci_aa{.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,.pNext = nullptr,- .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,+ .flags = 0,.maxSets = static_cast<u32>(image_count),.poolSizeCount = static_cast<u32>(pool_sizes_aa.size()),.pPoolSizes = pool_sizes_aa.data(),diff --git a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp b/src/video_core/renderer_vulkan/vk_descriptor_pool.cppindex b5ae6443ca..6048a301fa 100644--- a/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp+++ b/src/video_core/renderer_vulkan/vk_descriptor_pool.cpp@@ -77,7 +77,7 @@ static void AllocatePool(const Device& device, DescriptorBank& bank) {bank.pools.push_back(device.GetLogical().CreateDescriptorPool({.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,.pNext = nullptr,- .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,+ .flags = 0,.maxSets = sets_per_pool,.poolSizeCount = static_cast<u32>(pool_cursor),.pPoolSizes = std::data(pool_sizes),diff --git a/src/video_core/renderer_vulkan/vk_fsr.cpp b/src/video_core/renderer_vulkan/vk_fsr.cppindex 9bcdca2fb6..ce8f3f3c2a 100644--- a/src/video_core/renderer_vulkan/vk_fsr.cpp+++ b/src/video_core/renderer_vulkan/vk_fsr.cpp@@ -150,7 +150,7 @@ void FSR::CreateDescriptorPool() {const VkDescriptorPoolCreateInfo ci{.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,.pNext = nullptr,- .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,+ .flags = 0,.maxSets = static_cast<u32>(image_count * 2),.poolSizeCount = static_cast<u32>(pool_sizes.size()),.pPoolSizes = pool_sizes.data(),diff --git a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp b/src/video_core/renderer_vulkan/vk_turbo_mode.cppindex 460d8d59da..04a51f2d1e 100644--- a/src/video_core/renderer_vulkan/vk_turbo_mode.cpp+++ b/src/video_core/renderer_vulkan/vk_turbo_mode.cpp@@ -62,7 +62,7 @@ void TurboMode::Run(std::stop_token stop_token) {auto descriptor_pool = dld.CreateDescriptorPool(VkDescriptorPoolCreateInfo{.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,.pNext = nullptr,- .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,+ .flags = 0,.maxSets = 1,.poolSizeCount = 1,.pPoolSizes = &pool_size,