From 66bef96adbcf9c691176b918a197b7d437a3d00e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 13 May 2024 12:53:17 -0700 Subject: [PATCH] [imgui/vsgimgui] Update imgui to 1.90.6 and vsgimgui to 0.3.0 (#38669) Fixes #38662, update `imgui` to 1.90.6, update `vsgimgui` to 0.3.0. imgui - Except `osx-binding, metal-binding, android-binding`, other features are tested successfully in the following triplet: ``` x64-windows x64-windows-static ``` Except `osx-binding,metal-binding,android-binding,dx12-binding`, other features are tested successfully in the following triplet: ``` x86-windows ``` - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --------- Co-authored-by: Monica --- ports/imgui/portfile.cmake | 4 +-- ports/imgui/vcpkg.json | 2 +- ports/vsgimgui/devendor.patch | 16 ++++++++---- ports/vsgimgui/portfile.cmake | 2 +- .../remove-manual-font-creation.patch | 25 +++---------------- ports/vsgimgui/vcpkg.json | 2 +- versions/baseline.json | 4 +-- versions/i-/imgui.json | 5 ++++ versions/v-/vsgimgui.json | 5 ++++ 9 files changed, 31 insertions(+), 34 deletions(-) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 0fd1fb13bd..f31b28a73a 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -5,7 +5,7 @@ if ("docking-experimental" IN_LIST FEATURES) OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF "v${VERSION}-docking" - SHA512 05f352f4c6739eb672396c33d8fb9765c3fbf8f221c4fa9d09644ae669771cb6c86be7ca110c09d8c3e0d1be37da0a7f5667ebd5280ae8e0a6fcc6efaf338fa7 + SHA512 f4e97f8a191276b1deb1510cb9136ab7a9a4abc029727f752dff8c01bb6af4a692b2239de84839aa39aa359220f08ffe9bdff01b57942dd6e01183ec6778cfa7 HEAD_REF docking ) else() @@ -13,7 +13,7 @@ else() OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui REF "v${VERSION}" - SHA512 bd7ac28a1ef7b236e8051d83288ba9fe5f4d0321143ca325b7eb8649a24c0bf047b02b854fac828eb45c99517c7f579bb6bad1dabeeed3c323d714a94102a8e6 + SHA512 c9ff56ec6f8eb05b5034bb0b886568e843743a4313e36613db214f6080506703d5ed2ee606c88cd8957e73575e2b0e39deb52e1ac0c1a6e0a9fe38bca5e6dc0e HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index ce9d06ee7d..943ff87ac1 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.90.2", + "version": "1.90.6", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/ports/vsgimgui/devendor.patch b/ports/vsgimgui/devendor.patch index c73c849181..aba25a8f2c 100644 --- a/ports/vsgimgui/devendor.patch +++ b/ports/vsgimgui/devendor.patch @@ -54,10 +54,10 @@ index b4210d2..33198e4 100644 namespace vsgImGui { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2226b13..1200b42 100644 +index 41d749d..919159e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -6,34 +6,15 @@ set(EXTRA_INCLUDES) +@@ -6,40 +6,21 @@ set(EXTRA_INCLUDES) SET(HEADER_PATH ${VSGIMGUI_SOURCE_DIR}/include/vsgImGui) set(HEADERS @@ -80,19 +80,25 @@ index 2226b13..1200b42 100644 vsgImGui/SendEventsToImGui.cpp vsgImGui/Texture.cpp - imgui/imgui.cpp -- imgui/imgui_demo.cpp - imgui/imgui_draw.cpp - imgui/imgui_tables.cpp - imgui/imgui_widgets.cpp - imgui/backends/imgui_impl_vulkan.cpp - imgui/misc/cpp/imgui_stdlib.cpp - implot/implot.cpp -- implot/implot_demo.cpp - implot/implot_items.cpp ) + OPTION(SHOW_DEMO_WINDOW "Toggle the build of the ImGui::ShowDemoWindow(bool*) and ImPlot::ShadowDemoWindow(bool*)" ON) -@@ -63,6 +44,8 @@ target_include_directories(vsgImGui PUBLIC + if (SHOW_DEMO_WINDOW) + set(SOURCES ${SOURCES} +- imgui/imgui_demo.cpp +- implot/implot_demo.cpp + ) + else() + set(SOURCES ${SOURCES} +@@ -73,6 +54,8 @@ target_include_directories(vsgImGui PUBLIC target_link_libraries(vsgImGui PUBLIC vsg::vsg diff --git a/ports/vsgimgui/portfile.cmake b/ports/vsgimgui/portfile.cmake index 5c4a773340..38cbb639f3 100644 --- a/ports/vsgimgui/portfile.cmake +++ b/ports/vsgimgui/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vsg-dev/vsgImGui REF "v${VERSION}" - SHA512 8f3fca47ed7fd4b0a43eaff190457a3e1cf20355f69dd5000bd9f01218855f658fd934ec2abe8b768c11d3c1389a652cdafd9f0b589392878e666b4acd86fc70 + SHA512 f27ef25edb95c2129553732054080582a6990b6d84ae6f3ff2007489f02cfcb6ce3f728eb56b584315f5e9835daf74d104962b07b35463ba655bf7aa5c99489c HEAD_REF master PATCHES devendor.patch diff --git a/ports/vsgimgui/remove-manual-font-creation.patch b/ports/vsgimgui/remove-manual-font-creation.patch index 0efbb7c4bd..4ca7e1ce17 100644 --- a/ports/vsgimgui/remove-manual-font-creation.patch +++ b/ports/vsgimgui/remove-manual-font-creation.patch @@ -11,7 +11,7 @@ index e8186c6..8059d75 100644 } // namespace vsgImGui diff --git a/src/vsgImGui/RenderImGui.cpp b/src/vsgImGui/RenderImGui.cpp -index bda3137..7ec6136 100644 +index 306030b..d662531 100644 --- a/src/vsgImGui/RenderImGui.cpp +++ b/src/vsgImGui/RenderImGui.cpp @@ -60,7 +60,6 @@ namespace vsgImGui @@ -30,32 +30,13 @@ index bda3137..7ec6136 100644 } RenderImGui::~RenderImGui() -@@ -183,30 +181,6 @@ void RenderImGui::_init( +@@ -184,11 +182,6 @@ void RenderImGui::_init( } } -void RenderImGui::_uploadFonts() -{ -- auto commandPool = vsg::CommandPool::create(_device, _queueFamily, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT); -- auto fence = vsg::Fence::create(_device); -- -- uint64_t timeout = 1000000000; -- vsg::submitCommandsToQueue(commandPool, fence, timeout, _queue, [&](vsg::CommandBuffer& commandBuffer) { -- ImGui_ImplVulkan_CreateFontsTexture(commandBuffer); -- }); -- -- VkResult result = fence->status(); -- while (result == VK_NOT_READY) -- { -- result = fence->wait(timeout); -- } -- -- if (result != VK_SUCCESS) -- { -- vsg::error("RenderImGui::_uploadFonts(), fence->state() = ", result); -- } -- -- ImGui_ImplVulkan_DestroyFontUploadObjects(); +- ImGui_ImplVulkan_CreateFontsTexture(); -} - void RenderImGui::accept(vsg::RecordTraversal& rt) const diff --git a/ports/vsgimgui/vcpkg.json b/ports/vsgimgui/vcpkg.json index 4a13c67257..fb7056ce0a 100644 --- a/ports/vsgimgui/vcpkg.json +++ b/ports/vsgimgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vsgimgui", - "version": "0.1.0", + "version": "0.3.0", "description": "Library that integrates VulkanSceneGraph with Dear ImGui & ImPlot.", "homepage": "https://github.com/vsg-dev/vsgImGui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 51f5b0eb64..a25e1e22d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3597,7 +3597,7 @@ "port-version": 0 }, "imgui": { - "baseline": "1.90.2", + "baseline": "1.90.6", "port-version": 0 }, "imgui-node-editor": { @@ -9197,7 +9197,7 @@ "port-version": 0 }, "vsgimgui": { - "baseline": "0.1.0", + "baseline": "0.3.0", "port-version": 0 }, "vsgxchange": { diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 6033d8e25f..e6b55e25e2 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c5ccb0267846fbcf5153a375c6e05c65ad3c7ab", + "version": "1.90.6", + "port-version": 0 + }, { "git-tree": "d9be79046f87d6b17d50967e3b76f2460e0d1bf3", "version": "1.90.2", diff --git a/versions/v-/vsgimgui.json b/versions/v-/vsgimgui.json index 3579ead2a1..dc3271f7e8 100644 --- a/versions/v-/vsgimgui.json +++ b/versions/v-/vsgimgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6ad48a2b4865f57e57b4542c46c9223f3136a3a", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "eb1104907bad19da30c10108718f012c7a1c6c22", "version": "0.1.0",