mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 15:31:38 +08:00
66bef96adb
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 <v-liumonica@microsoft.com>
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
diff --git a/include/vsgImGui/RenderImGui.h b/include/vsgImGui/RenderImGui.h
|
|
index e8186c6..8059d75 100644
|
|
--- a/include/vsgImGui/RenderImGui.h
|
|
+++ b/include/vsgImGui/RenderImGui.h
|
|
@@ -86,7 +86,6 @@ namespace vsgImGui
|
|
vsg::ref_ptr<vsg::RenderPass> renderPass,
|
|
uint32_t minImageCount, uint32_t imageCount,
|
|
VkExtent2D imageSize, bool useClearAttachments);
|
|
- void _uploadFonts();
|
|
};
|
|
|
|
} // namespace vsgImGui
|
|
diff --git a/src/vsgImGui/RenderImGui.cpp b/src/vsgImGui/RenderImGui.cpp
|
|
index 306030b..d662531 100644
|
|
--- a/src/vsgImGui/RenderImGui.cpp
|
|
+++ b/src/vsgImGui/RenderImGui.cpp
|
|
@@ -60,7 +60,6 @@ namespace vsgImGui
|
|
RenderImGui::RenderImGui(const vsg::ref_ptr<vsg::Window>& window, bool useClearAttachments)
|
|
{
|
|
_init(window, useClearAttachments);
|
|
- _uploadFonts();
|
|
}
|
|
|
|
RenderImGui::RenderImGui(vsg::ref_ptr<vsg::Device> device, uint32_t queueFamily,
|
|
@@ -69,7 +68,6 @@ RenderImGui::RenderImGui(vsg::ref_ptr<vsg::Device> device, uint32_t queueFamily,
|
|
VkExtent2D imageSize, bool useClearAttachments)
|
|
{
|
|
_init(device, queueFamily, renderPass, minImageCount, imageCount, imageSize, useClearAttachments);
|
|
- _uploadFonts();
|
|
}
|
|
|
|
RenderImGui::~RenderImGui()
|
|
@@ -184,11 +182,6 @@ void RenderImGui::_init(
|
|
}
|
|
}
|
|
|
|
-void RenderImGui::_uploadFonts()
|
|
-{
|
|
- ImGui_ImplVulkan_CreateFontsTexture();
|
|
-}
|
|
-
|
|
void RenderImGui::accept(vsg::RecordTraversal& rt) const
|
|
{
|
|
auto& commandBuffer = *(rt.getState()->_commandBuffer);
|