Skip to content
Snippets Groups Projects
Verified Commit 22750f9a authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Update submodules and fix build issues

parent 59e58762
Branches
No related tags found
No related merge requests found
Showing
with 26 additions and 30 deletions
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
branch = main branch = main
[submodule "lib/VulkanMemoryAllocator-Hpp"] [submodule "lib/VulkanMemoryAllocator-Hpp"]
path = lib/VulkanMemoryAllocator-Hpp path = lib/VulkanMemoryAllocator-Hpp
url = https://github.com/TheJackiMonster/VulkanMemoryAllocator-Hpp.git url = https://github.com/YaaZ/VulkanMemoryAllocator-Hpp.git
branch = fix branch = master
[submodule "modules/algorithm/lib/FidelityFX-SPD"] [submodule "modules/algorithm/lib/FidelityFX-SPD"]
path = modules/algorithm/lib/FidelityFX-SPD path = modules/algorithm/lib/FidelityFX-SPD
url = https://github.com/GPUOpen-Effects/FidelityFX-SPD.git url = https://github.com/GPUOpen-Effects/FidelityFX-SPD.git
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* @brief Template event struct to synchronize callbacks. * @brief Template event struct to synchronize callbacks.
*/ */
#include <algorithm>
#include <functional> #include <functional>
#ifndef __MINGW32__ #ifndef __MINGW32__
......
Subproject commit 5e963d62fa3f2f0ff891c9f9ca150097127c3aad Subproject commit 2d990d355a296ae1e368585810f884ebadcc4773
Subproject commit 4f51aac14f65629dfe83702b806f740dbd7bd701 Subproject commit d192041a2fc9c9fd8ae67d8ae3f32c5511541f04
Subproject commit 128261aa4517aaf3b30809a27311dd7e1cb5dbea Subproject commit 6fb0c202be3a13ae8e630fcc734340a6679e8502
Subproject commit 2f382df218d7e8516dee3b3caccb819a62b571a2 Subproject commit 7942b798289f752dc23b0a79516fd8545febd718
Subproject commit 4aa5600e01c533edf42620b91a79e199dae6d0a1 Subproject commit 8335d9d6ff3574c89e6cf363ec1d279179f9b957
Subproject commit 3eaf1255b29fdf5c2895856c7be7d7185ef2b241 Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d
Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
Subproject commit 5736b15f7ea0ffb08dd38af21067c314d6a3aae9 Subproject commit 013ac3beddff3dbffafd5177e7972067cd2b5083
Subproject commit e3f919ccfe3ef542cfc983a82146070258fb57f8 Subproject commit 50869df0ea703b4f41b238bfe26aec6ec9c86889
Subproject commit 47585fde0c49fa77a2bf2fb1d2ead06999fd4b6e Subproject commit 33b4a621a697a305bc3a7610d290677b96beb181
Subproject commit 6c022f9bf12a39c2dffc8ff0015273ce6737e1a0 Subproject commit b902fa4c4490ddffb713f8153d1a65e1940e58d1
...@@ -90,7 +90,7 @@ namespace vkcv::gui { ...@@ -90,7 +90,7 @@ namespace vkcv::gui {
init_info.MinImageCount = swapchainImageCount; init_info.MinImageCount = swapchainImageCount;
init_info.ImageCount = swapchainImageCount; init_info.ImageCount = swapchainImageCount;
init_info.CheckVkResultFn = checkVulkanResult; init_info.CheckVkResultFn = checkVulkanResult;
const vk::AttachmentDescription attachment ( const vk::AttachmentDescription attachment (
vk::AttachmentDescriptionFlags(), vk::AttachmentDescriptionFlags(),
m_core.getSwapchainFormat(swapchainHandle), m_core.getSwapchainFormat(swapchainHandle),
...@@ -141,19 +141,11 @@ namespace vkcv::gui { ...@@ -141,19 +141,11 @@ namespace vkcv::gui {
&dependency &dependency
); );
m_render_pass = m_context.getDevice().createRenderPass(passCreateInfo); init_info.RenderPass = m_context.getDevice().createRenderPass(passCreateInfo);
ImGui_ImplVulkan_Init(&init_info, static_cast<VkRenderPass>(m_render_pass));
auto stream = m_core.createCommandStream(QueueType::Graphics);
m_core.recordCommandsToStream(stream, [](const vk::CommandBuffer& commandBuffer) {
ImGui_ImplVulkan_CreateFontsTexture(static_cast<VkCommandBuffer>(commandBuffer));
}, []() {
ImGui_ImplVulkan_DestroyFontUploadObjects();
});
m_core.submitCommandStream(stream, false); ImGui_ImplVulkan_Init(&init_info);
ImGui_ImplVulkan_CreateFontsTexture();
m_context.getDevice().waitIdle(); m_context.getDevice().waitIdle();
} }
...@@ -161,6 +153,7 @@ namespace vkcv::gui { ...@@ -161,6 +153,7 @@ namespace vkcv::gui {
m_context.getDevice().waitIdle(); m_context.getDevice().waitIdle();
Window& window = m_core.getWindow(m_windowHandle); Window& window = m_core.getWindow(m_windowHandle);
ImGui_ImplVulkan_DestroyFontsTexture();
ImGui_ImplVulkan_Shutdown(); ImGui_ImplVulkan_Shutdown();
m_context.getDevice().destroyRenderPass(m_render_pass); m_context.getDevice().destroyRenderPass(m_render_pass);
...@@ -188,6 +181,7 @@ namespace vkcv::gui { ...@@ -188,6 +181,7 @@ namespace vkcv::gui {
ImGui_ImplVulkan_NewFrame(); ImGui_ImplVulkan_NewFrame();
ImGui_ImplGlfw_NewFrame(); ImGui_ImplGlfw_NewFrame();
ImGui::NewFrame(); ImGui::NewFrame();
} }
......
Subproject commit bdd1b2ab1f03e616047bbcf8971157dccd50c792 Subproject commit eb49bb7b1136298b77945c52b4bbbc433f7885de
Subproject commit 4c57db1595462c51d5080893f65c42fc1f318146 Subproject commit 68821c4da8189262228bbd51e56ed75971b2d2c9
Subproject commit dabed80523fa5101e30f0ee57ba06b02beae73eb Subproject commit 6e481aa06166c2b31e391005c6e50f0adef5e4d4
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <vkcv/Logger.hpp> #include <vkcv/Logger.hpp>
#include <glslang/SPIRV/GlslangToSpv.h> #include <glslang/SPIRV/GlslangToSpv.h>
#include <glslang/glslang/Public/ShaderLang.h>
namespace vkcv::shader { namespace vkcv::shader {
......
Subproject commit e3d822adee738de936da5d9541dff266f899ed46 Subproject commit 0d57803ab9cc8a6a507d8060b9b5b3b6f3a5d75f
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment