From 8b1709194a63491dd9dbb1ba11f6f6657c1edc32 Mon Sep 17 00:00:00 2001 From: Chang Gao <gc@roastew.com> Date: Fri, 22 May 2020 00:34:17 +0200 Subject: [PATCH] Use static loader if using low version vulkan header Do not clear framebuffer when draw imgui to a view --- imgui/lava-extras/imgui/ImGui.cc | 2 +- imgui/lava-extras/imgui/impl/imgui_impl_lava.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/imgui/lava-extras/imgui/ImGui.cc b/imgui/lava-extras/imgui/ImGui.cc index 81a499f..baf80cb 100644 --- a/imgui/lava-extras/imgui/ImGui.cc +++ b/imgui/lava-extras/imgui/ImGui.cc @@ -50,7 +50,7 @@ void ImGui::connectViews(const std::vector<SharedImageView> &views) { ::ImGui::SetCurrentContext(mContext); mUsage = TO_TEXTURE; - setupPass(true, views[0]->format()); + setupPass(false, views[0]->format()); prepare(views); ImGuiIO &io = ::ImGui::GetIO(); diff --git a/imgui/lava-extras/imgui/impl/imgui_impl_lava.cc b/imgui/lava-extras/imgui/impl/imgui_impl_lava.cc index 509fb4d..305aba4 100644 --- a/imgui/lava-extras/imgui/impl/imgui_impl_lava.cc +++ b/imgui/lava-extras/imgui/impl/imgui_impl_lava.cc @@ -154,7 +154,7 @@ namespace { #ifdef VULKAN_HPP_DEFAULT_DISPATCHER auto const& d = VULKAN_HPP_DEFAULT_DISPATCHER; #else - auto const& d = ::VULKAN_HPP_NAMESPACE::DispatchLoaderDynamic(); + auto const& d = ::VULKAN_HPP_NAMESPACE::DispatchLoaderStatic(); #endif } -- GitLab