Merge branch 'develop' into user/kernel/fix-command-buffer-manager

JeanPhilippeKernel · web-flow · commit 2ebd2f3e9605 · 2026-03-07T15:59:01.000+09:00
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -57,9 +57,9 @@
             }
         },
         {
-            "name": "Windows_x64_Debug",
+            "name": "Windows_x64_Debug_2022",
             "inherits": "BaseOptions",
-            "displayName": "Windows Visual Studio Debug",
+            "displayName": "Windows Visual Studio 2022 Debug",
             "generator": "Visual Studio 17 2022",
             "binaryDir": "Result.Windows.x64.MultiConfig",
             "architecture": "x64",
@@ -70,14 +70,28 @@
 
         },
         {
-            "name": "Windows_x64_Release",
-            "displayName": "Windows Visual Studio Release",
-            "inherits": "Windows_x64_Debug",
+            "name": "Windows_x64_Release_2022",
+            "displayName": "Windows Visual Studio 2022 Release",
+            "inherits": "Windows_x64_Debug_2022",
             "cacheVariables": {
                 "CMAKE_CONFIGURATION_TYPES": "Release"
             }
         },
 
+        {
+            "name": "Windows_x64_Debug_2026",
+            "inherits": "Windows_x64_Debug_2022",
+            "displayName": "Windows Visual Studio 2026 Debug",
+            "generator": "Visual Studio 18 2026"
+        }, 
+
+        {
+            "name": "Windows_x64_Release_2026",
+            "inherits": "Windows_x64_Release_2022",
+            "displayName": "Windows Visual Studio 2026 Release",
+            "generator": "Visual Studio 18 2026"
+        }, 
+
         {
             "name": "Darwin_x64_Debug",
             "inherits": "BaseOptions",
@@ -147,22 +161,34 @@
 
     "buildPresets": [
         {
-            "name": "Windows_x64_Debug",
-            "configurePreset": "Windows_x64_Debug",
+            "name": "Windows_x64_Debug_2022",
+            "configurePreset": "Windows_x64_Debug_2022",
             "configuration": "Debug",
             "nativeToolOptions": [
                 "-nodeReuse:false"
             ]
         },
         {
-            "name": "Windows_x64_Release",
-            "configurePreset": "Windows_x64_Release",
+            "name": "Windows_x64_Release_2022",
+            "configurePreset": "Windows_x64_Release_2022",
             "configuration": "Release",
             "nativeToolOptions": [
                 "-nodeReuse:false"
             ]
         },
 
+        {
+            "name": "Windows_x64_Debug_2026",
+            "inherits": "Windows_x64_Debug_2022",
+            "configurePreset": "Windows_x64_Debug_2026"
+        },
+
+        {
+            "name": "Windows_x64_Release_2026",
+            "inherits": "Windows_x64_Release_2022",
+            "configurePreset": "Windows_x64_Release_2026"
+        },
+
         {
             "name": "Darwin_x64_Debug",
             "configuration": "Debug",
diff --git a/Scripts/BuildEngine.ps1 b/Scripts/BuildEngine.ps1
@@ -42,7 +42,7 @@ param (
     [bool] $VerifyFormatting = $False,
 
     [Parameter(HelpMessage = "VS version use to build, default to 2022")]
-    [ValidateSet(2022)]
+    [ValidateSet('2022', '2026')]
     [int] $VsVersion = 2022,
 
     [Parameter(HelpMessage = "Build Launcher only")]
@@ -121,6 +121,10 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     # Define CMake Generator arguments
     $configName = $systemName, $architecture, $configuration -join "_"
 
+    if($IsWindows){
+        $configName += '_'+$VsVersion
+    }
+
     $cMakeArguments = " --preset $configName $cMakeCacheVariableOverride"
 
     # CMake Generation process
@@ -130,8 +134,9 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         throw "cmake failed generation for '$cMakeArguments' with exit code '$cMakeProcess.ExitCode'"
     }
 
+
+    if ($runBuild) {
     # CMake Build Process
-    #
     
         Write-Host "Building $systemName $architecture $configuration"
 
@@ -166,6 +171,7 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
         if($installProcess.ExitCode -ne 0){
             throw "cmake failed to install to '$install_directory'"
         }
+    }
 }
 
 
diff --git a/Tetragrama/Components/DockspaceUIComponent.cpp b/Tetragrama/Components/DockspaceUIComponent.cpp
@@ -40,7 +40,7 @@ namespace Tetragrama::Components
         m_editor_serializer->Initialize(parent->Arena);
         m_asset_importer->Initialize(parent->Arena);
 
-        m_dockspace_node_flag                 = ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_PassthruCentralNode;
+        m_dockspace_node_flag                 = ImGuiDockNodeFlags_NoWindowMenuButton | static_cast<decltype(ImGuiDockNodeFlags_NoWindowMenuButton)>(ImGuiDockNodeFlags_PassthruCentralNode);
         m_window_flags                        = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
 
         auto app                              = reinterpret_cast<EditorPtr>(ParentLayer->CurrentApp);
@@ -211,7 +211,7 @@ namespace Tetragrama::Components
 
             ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
             ImGui::SetCursorPos(ImVec2(10, ImGui::GetWindowSize().y - 30));
-            ImGui::TextColored(s_asset_importer_report_msg_color, s_asset_importer_report_msg.c_str());
+            ImGui::TextColored(s_asset_importer_report_msg_color, "%s", s_asset_importer_report_msg.c_str());
             ImGui::PopFont();
 
             ImGui::EndPopup();
@@ -244,7 +244,7 @@ namespace Tetragrama::Components
 
             ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
             ImGui::SetCursorPos(ImVec2(10, wind_size.y - 30));
-            ImGui::TextColored(s_scene_serializer_log_color, s_scene_serializer_log);
+            ImGui::TextColored(s_scene_serializer_log_color, "%s", s_scene_serializer_log);
             ImGui::PopFont();
 
             ImGui::EndPopup();
@@ -385,7 +385,7 @@ namespace Tetragrama::Components
 
         if (ImGui::BeginPopupModal(str_id, NULL, ImGuiWindowFlags_AlwaysAutoResize))
         {
-            ImGui::Text(fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
+            ImGui::Text("%s", fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
             ImGui::Separator();
 
             if (ImGui::Button("Save", ImVec2(120, 0)))
diff --git a/Tetragrama/Messengers/Messenger.h b/Tetragrama/Messengers/Messenger.h
@@ -141,6 +141,7 @@ namespace Tetragrama::Messengers
             // catch (...)
             //{
             //}
+            return {};
         }
 
         template <typename TRecipient, typename TMessage>
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp b/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
@@ -696,22 +696,22 @@ namespace ZEngine::Hardwares
 
     VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDevice::__debugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData)
     {
-        if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
+        if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
         {
             ZENGINE_CORE_ERROR("{}", pCallbackData->pMessage)
         }
 
-        if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
+        if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
         {
             ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
         }
 
-        if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
+        if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
         {
             ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
         }
 
-        if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
+        if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
         {
             ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
         }
@@ -936,6 +936,8 @@ namespace ZEngine::Hardwares
                 dst_access_mask    = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
                 dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
                 break;
+            case UNKNOWN:
+                break;
         }
 
         VkBufferMemoryBarrier bufMemBarrier2 = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER};
@@ -1237,6 +1239,8 @@ namespace ZEngine::Hardwares
                                 vkFreeDescriptorSets(LogicalDevice, reinterpret_cast<VkDescriptorPool>(res_handle.Data1), 1, &ds);
                                 break;
                             }
+                            case DeviceResourceType::RESOURCE_COUNT:
+                                break;
                         }
 
                         DirtyResources.Remove(handle);
@@ -2085,7 +2089,7 @@ namespace ZEngine::Hardwares
 
     void Image2DBuffer::Dispose()
     {
-        if (this && m_buffer_image)
+        if (m_buffer_image)
         {
             Device->EnqueueBufferImageForDeletion(m_buffer_image);
             m_buffer_image = {};
@@ -2223,6 +2227,8 @@ namespace ZEngine::Hardwares
                     dst_access_mask    = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
                     dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
                     break;
+                case UNKNOWN:
+                    break;
             }
 
             auto                  command_buffer_info = m_device->CommandBufferMgr->GetInstantCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE, (m_device->SwapchainPtr->CurrentFrame == nullptr ? 0u : m_device->SwapchainPtr->CurrentFrame->Index), 0, 2, true);
diff --git a/ZEngine/ZEngine/Helpers/HandleManager.h b/ZEngine/ZEngine/Helpers/HandleManager.h
@@ -18,11 +18,11 @@ namespace ZEngine::Helpers
     template <typename T>
     struct Handle
     {
-        uint32_t Index = UINT32_MAX;
+        uint64_t Index = UINT64_MAX;
 
         bool     Valid() const
         {
-            return Index != UINT32_MAX;
+            return Index != UINT64_MAX;
         }
 
         operator bool() const
diff --git a/dependencies.cmake b/dependencies.cmake
@@ -47,7 +47,7 @@ FetchContent_Declare(
   EnTT 
   GIT_REPOSITORY https://github.com/skypjack/entt.git
   GIT_SHALLOW TRUE 
-  GIT_TAG main
+  GIT_TAG v3.16.0
   )
 
 FetchContent_Declare(

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ namespace Tetragrama::Messengers`
`141`	`141`	`// catch (...)`
`142`	`142`	`//{`
`143`	`143`	`//}`
	`144`	`+ return {};`
`144`	`145`	`}`
`145`	`146`
`146`	`147`	`template <typename TRecipient, typename TMessage>`
Original file line number	Diff line number	Diff line change
`@@ -696,22 +696,22 @@ namespace ZEngine::Hardwares`
`696`	`696`
`697`	`697`	`VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDevice::__debugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData)`
`698`	`698`	`{`
`699`		`- if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)`
	`699`	`+ if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)`
`700`	`700`	`{`
`701`	`701`	`ZENGINE_CORE_ERROR("{}", pCallbackData->pMessage)`
`702`	`702`	`}`
`703`	`703`
`704`		`- if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)`
	`704`	`+ if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)`
`705`	`705`	`{`
`706`	`706`	`ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)`
`707`	`707`	`}`
`708`	`708`
`709`		`- if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)`
	`709`	`+ if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)`
`710`	`710`	`{`
`711`	`711`	`ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)`
`712`	`712`	`}`
`713`	`713`
`714`		`- if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)`
	`714`	`+ if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)`
`715`	`715`	`{`
`716`	`716`	`ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)`
`717`	`717`	`}`
`@@ -936,6 +936,8 @@ namespace ZEngine::Hardwares`
`936`	`936`	`dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;`
`937`	`937`	`dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;`
`938`	`938`	`break;`
	`939`	`+ case UNKNOWN:`
	`940`	`+ break;`
`939`	`941`	`}`
`940`	`942`
`941`	`943`	`VkBufferMemoryBarrier bufMemBarrier2 = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER};`
`@@ -1237,6 +1239,8 @@ namespace ZEngine::Hardwares`
`1237`	`1239`	`vkFreeDescriptorSets(LogicalDevice, reinterpret_cast<VkDescriptorPool>(res_handle.Data1), 1, &ds);`
`1238`	`1240`	`break;`
`1239`	`1241`	`}`
	`1242`	`+ case DeviceResourceType::RESOURCE_COUNT:`
	`1243`	`+ break;`
`1240`	`1244`	`}`
`1241`	`1245`
`1242`	`1246`	`DirtyResources.Remove(handle);`
`@@ -2085,7 +2089,7 @@ namespace ZEngine::Hardwares`
`2085`	`2089`
`2086`	`2090`	`void Image2DBuffer::Dispose()`
`2087`	`2091`	`{`
`2088`		`- if (this && m_buffer_image)`
	`2092`	`+ if (m_buffer_image)`
`2089`	`2093`	`{`
`2090`	`2094`	`Device->EnqueueBufferImageForDeletion(m_buffer_image);`
`2091`	`2095`	`m_buffer_image = {};`
`@@ -2223,6 +2227,8 @@ namespace ZEngine::Hardwares`
`2223`	`2227`	`dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;`
`2224`	`2228`	`dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;`
`2225`	`2229`	`break;`
	`2230`	`+ case UNKNOWN:`
	`2231`	`+ break;`
`2226`	`2232`	`}`
`2227`	`2233`
`2228`	`2234`	`auto command_buffer_info = m_device->CommandBufferMgr->GetInstantCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE, (m_device->SwapchainPtr->CurrentFrame == nullptr ? 0u : m_device->SwapchainPtr->CurrentFrame->Index), 0, 2, true);`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ namespace ZEngine::Helpers`
`18`	`18`	`template <typename T>`
`19`	`19`	`struct Handle`
`20`	`20`	`{`
`21`		`- uint32_t Index = UINT32_MAX;`
	`21`	`+ uint64_t Index = UINT64_MAX;`
`22`	`22`
`23`	`23`	`bool Valid() const`
`24`	`24`	`{`
`25`		`- return Index != UINT32_MAX;`
	`25`	`+ return Index != UINT64_MAX;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`operator bool() const`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ FetchContent_Declare(`
`47`	`47`	`EnTT`
`48`	`48`	`GIT_REPOSITORY https://github.com/skypjack/entt.git`
`49`	`49`	`GIT_SHALLOW TRUE`
`50`		`- GIT_TAG main`
	`50`	`+ GIT_TAG v3.16.0`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`FetchContent_Declare(`