mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-03 08:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backends: Vulkan: ImGui_ImplVulkan_CreatePipeline() for secondary viewport always use the RenderPass created by the ImGui_ImplVulkanH_CreateOrResizeWindow(). (#8946, #8110)

Browse Source
This commit is contained in:
ocornut
2025-09-29 15:06:58 +02:00
parent bad3c14ff6
commit 1f020e526a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backends/imgui_impl_vulkan.cpp
View File

@@ -1322,8 +1322,6 @@ bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info)
IM_ASSERT(info->DescriptorPoolSize > 0); IM_ASSERT(info->DescriptorPoolSize > 0);
if (info->UseDynamicRendering) if (info->UseDynamicRendering)
IM_ASSERT(info->PipelineInfoMain.RenderPass == VK_NULL_HANDLE && info->PipelineInfoForViewports.RenderPass == VK_NULL_HANDLE); IM_ASSERT(info->PipelineInfoMain.RenderPass == VK_NULL_HANDLE && info->PipelineInfoForViewports.RenderPass == VK_NULL_HANDLE);
else if (info->PipelineInfoForViewports.RenderPass == NULL)
info->PipelineInfoForViewports.RenderPass = info->PipelineInfoMain.RenderPass;
bd->VulkanInitInfo = *info; bd->VulkanInitInfo = *info;
@@ -2014,7 +2012,7 @@ static void ImGui_ImplVulkan_CreateWindow(ImGuiViewport* viewport)
} }
else else
{ {
IM_ASSERT(pipeline_info->RenderPass != VK_NULL_HANDLE && "Did you set ImGui_ImplVulkan_InitInfo::PipelineInfoForViewports.RenderPass?"); // Since 1.92.4 it is required. pipeline_info->RenderPass = wd->RenderPass;
} }
#endif #endif
bd->PipelineForViewports = ImGui_ImplVulkan_CreatePipeline(v->Device, v->Allocator, VK_NULL_HANDLE, &v->PipelineInfoForViewports); bd->PipelineForViewports = ImGui_ImplVulkan_CreatePipeline(v->Device, v->Allocator, VK_NULL_HANDLE, &v->PipelineInfoForViewports);

4
backends/imgui_impl_vulkan.h
View File

@@ -69,8 +69,10 @@
// Specify settings to create pipeline and swapchain // Specify settings to create pipeline and swapchain
struct ImGui_ImplVulkan_PipelineInfo struct ImGui_ImplVulkan_PipelineInfo
{ {
// For Main and Secondary viewports // For Main viewport only
VkRenderPass RenderPass; // Ignored if using dynamic rendering VkRenderPass RenderPass; // Ignored if using dynamic rendering
// For Main and Secondary viewports
uint32_t Subpass; // uint32_t Subpass; //
VkSampleCountFlagBits MSAASamples = {}; // 0 defaults to VK_SAMPLE_COUNT_1_BIT VkSampleCountFlagBits MSAASamples = {}; // 0 defaults to VK_SAMPLE_COUNT_1_BIT
#ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING #ifdef IMGUI_IMPL_VULKAN_HAS_DYNAMIC_RENDERING