Increase Vulkan descriptor pools and add guards

Cap instance API to VK_API_VERSION_1_3 and enlarge Vulkan descriptor pools to reduce descriptor exhaustion: preview pool descriptorCount/maxSets increased from 64 to 256, and main pool combined image sampler and maxSets increased from 256 to 1024. Also add early-return guards in imiv_test_engine to skip test-engine hooks when ui_ctx->TestEngine is null, avoiding invalid hook calls when the test engine is not initialized.

Signed-off-by: Vlad (Kuzmin) Erium <libalias@gmail.com>

Author: ssh4net

src/imiv/imiv_test_engine.cpp

@@ -1937,6 +1937,8 @@ register_layout_dump_synthetic_rect(const char* kind, const char* label,
                       kind ? kind : "item");
     }
 
+    if (ui_ctx->TestEngine == nullptr)
+        return;
     const ImRect bb(min, max);
     ImGuiTestEngineHook_ItemAdd(ui_ctx, id, bb, nullptr);
     ImGuiTestEngineHook_ItemInfo(ui_ctx, id, debug_label,
@@ -1969,6 +1971,8 @@ register_test_engine_item_label(const char* label, bool openable)
     const ImGuiID id = ImGui::GetID(id_source);
     if (id == 0)
         return;
+    if (ui_ctx->TestEngine == nullptr)
+        return;
     const ImRect bb(min, max);
     ImGuiItemStatusFlags flags = ImGuiItemStatusFlags_None;
     if (openable)

src/imiv/imiv_vulkan_setup.cpp

@@ -112,7 +112,9 @@ query_loader_api_version()
 uint32_t
 choose_instance_api_version()
 {
-    return std::min(vulkan_header_api_version(), query_loader_api_version());
+    return std::min(std::min(vulkan_header_api_version(),
+                             query_loader_api_version()),
+                    VK_API_VERSION_1_3);
 }
 
 
@@ -846,11 +848,11 @@ init_preview_resources(VulkanState& vk_state, std::string& error_message)
 
     VkDescriptorPoolSize preview_pool_size = {};
     preview_pool_size.type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
-    preview_pool_size.descriptorCount          = 64;
+    preview_pool_size.descriptorCount          = 256;
     VkDescriptorPoolCreateInfo preview_pool_ci = {};
     preview_pool_ci.sType   = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
     preview_pool_ci.flags   = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
-    preview_pool_ci.maxSets = 64;
+    preview_pool_ci.maxSets = 256;
     preview_pool_ci.poolSizeCount = 1;
     preview_pool_ci.pPoolSizes    = &preview_pool_size;
     err = vkCreateDescriptorPool(vk_state.device, &preview_pool_ci,
@@ -1396,11 +1398,11 @@ setup_vulkan_device(VulkanState& vk_state, std::string& error_message)
                        "imiv.main.queue");
 
     VkDescriptorPoolSize pool_sizes[]
-        = { { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 256 } };
+        = { { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1024 } };
     VkDescriptorPoolCreateInfo pool_ci = {};
     pool_ci.sType         = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
     pool_ci.flags         = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
-    pool_ci.maxSets       = 256;
+    pool_ci.maxSets       = 1024;
     pool_ci.poolSizeCount = static_cast<uint32_t>(IM_ARRAYSIZE(pool_sizes));
     pool_ci.pPoolSizes    = pool_sizes;
     err = vkCreateDescriptorPool(vk_state.device, &pool_ci, vk_state.allocator,