Skip to content

Commit 1670beb

Browse files
committed
[vsgimgui] support imgui v1.92.5
1 parent 7b4da20 commit 1670beb

File tree

5 files changed

+30
-1
lines changed

5 files changed

+30
-1
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/src/vsgImGui/RenderImGui.cpp b/src/vsgImGui/RenderImGui.cpp
2+
index e3f1ad3..354fbdb 100644
3+
--- a/src/vsgImGui/RenderImGui.cpp
4+
+++ b/src/vsgImGui/RenderImGui.cpp
5+
@@ -176,7 +176,7 @@ void RenderImGui::_init(
6+
init_info.QueueFamily = _queueFamily;
7+
init_info.Queue = *(_queue); // ImGui doesn't use the queue so we shouldn't need to assign it, but it has an IM_ASSERT requiring it during debug build.
8+
init_info.PipelineCache = VK_NULL_HANDLE;
9+
- init_info.MSAASamples = samples;
10+
+ init_info.PipelineInfoMain.MSAASamples = samples;
11+
12+
// Create Descriptor Pool
13+
vsg::DescriptorPoolSizes pool_sizes = {
14+
@@ -196,7 +196,7 @@ void RenderImGui::_init(
15+
_descriptorPool = vsg::DescriptorPool::create(_device, maxSets, pool_sizes);
16+
17+
init_info.DescriptorPool = *_descriptorPool;
18+
- init_info.RenderPass = *renderPass;
19+
+ init_info.PipelineInfoMain.RenderPass = *renderPass;
20+
init_info.Allocator = nullptr;
21+
init_info.MinImageCount = std::max(minImageCount, 2u); // ImGui's Vulkan backend has an assert that requires MinImageCount to be 2 or more.
22+
init_info.ImageCount = imageCount;

ports/vsgimgui/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ vcpkg_from_github(
77
PATCHES
88
devendor.patch
99
remove-manual-font-creation.patch
10+
fix-imgui-1.92.5.patch
1011
)
1112
file(REMOVE "${SOURCE_PATH}/include/vsgImGui/imgui.h")
1213

ports/vsgimgui/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "vsgimgui",
33
"version": "0.7.0",
4+
"port-version": 1,
45
"description": "Library that integrates VulkanSceneGraph with Dear ImGui & ImPlot.",
56
"homepage": "https://github.com/vsg-dev/vsgImGui",
67
"license": "MIT",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10502,7 +10502,7 @@
1050210502
},
1050310503
"vsgimgui": {
1050410504
"baseline": "0.7.0",
10505-
"port-version": 0
10505+
"port-version": 1
1050610506
},
1050710507
"vsgqt": {
1050810508
"baseline": "0.4.0",

versions/v-/vsgimgui.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "98a71baf97be6e3e11753e3cdd0801ec844fcdf1",
5+
"version": "0.7.0",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "9200de3d696659de20b6a8fd62f393baa078fcbc",
510
"version": "0.7.0",

0 commit comments

Comments
 (0)