Compare commits
2 commits
059dc159bd
...
4a4939e65b
Author | SHA1 | Date | |
---|---|---|---|
Mars | 4a4939e65b | ||
Mars | 52123f27ac |
11
meson.build
11
meson.build
|
@ -29,12 +29,19 @@ deps = [
|
||||||
dependency('glfw3', include_type: 'system'),
|
dependency('glfw3', include_type: 'system'),
|
||||||
dependency('glm', include_type: 'system'),
|
dependency('glm', include_type: 'system'),
|
||||||
dependency('vulkan', include_type: 'system'),
|
dependency('vulkan', include_type: 'system'),
|
||||||
cpp.find_library('imgui'),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
imgui_dep = dependency('imgui', required: false, include_type: 'system')
|
||||||
|
|
||||||
|
if not imgui_dep.found()
|
||||||
|
imgui_dep = cpp.find_library('imgui', required: true)
|
||||||
|
endif
|
||||||
|
|
||||||
|
deps += imgui_dep
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
'graphics-test',
|
'graphics-test',
|
||||||
sources: files('src/main.cpp'),
|
sources: files('src/main.cpp'),
|
||||||
include_directories: include_directories('include', is_system: true),
|
include_directories: include_directories('include', is_system: true),
|
||||||
dependencies: deps,
|
dependencies: deps,
|
||||||
)
|
)
|
10
src/main.cpp
10
src/main.cpp
|
@ -342,6 +342,14 @@ class VulkanApp {
|
||||||
IMGUI_CHECKVERSION();
|
IMGUI_CHECKVERSION();
|
||||||
ImGui::CreateContext();
|
ImGui::CreateContext();
|
||||||
|
|
||||||
|
// Remember to use a reference here, otherwise
|
||||||
|
// the ImGui::GetIO() function will return a
|
||||||
|
// copy and the changes won't be saved.
|
||||||
|
ImGuiIO& imGuiIO = ImGui::GetIO();
|
||||||
|
|
||||||
|
// Disable writing imgui.ini
|
||||||
|
imGuiIO.IniFilename = nullptr;
|
||||||
|
|
||||||
// Setup Dear ImGui style
|
// Setup Dear ImGui style
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
|
|
||||||
|
@ -370,7 +378,7 @@ class VulkanApp {
|
||||||
.Queue = mGraphicsQueue,
|
.Queue = mGraphicsQueue,
|
||||||
.DescriptorPool = mImGuiDescriptorPool.get(),
|
.DescriptorPool = mImGuiDescriptorPool.get(),
|
||||||
.RenderPass = mRenderPass.get(),
|
.RenderPass = mRenderPass.get(),
|
||||||
.MinImageCount = 1,
|
.MinImageCount = MAX_FRAMES_IN_FLIGHT,
|
||||||
.ImageCount = static_cast<uint32_t>(mSwapChainImages.size()),
|
.ImageCount = static_cast<uint32_t>(mSwapChainImages.size()),
|
||||||
.MSAASamples = static_cast<VkSampleCountFlagBits>(mMsaaSamples),
|
.MSAASamples = static_cast<VkSampleCountFlagBits>(mMsaaSamples),
|
||||||
.PipelineCache = VK_NULL_HANDLE,
|
.PipelineCache = VK_NULL_HANDLE,
|
||||||
|
|
Loading…
Reference in a new issue