Skip to content

Commit 27ab2f4

Browse files
Fix Warnings (JeanPhilippeKernel#505)
- use String version of ImGui calls in DockspaceUIComponent - Change Handle::Index from uint32_t to uint64_t because it is we are using it to represent a void* and as we are generally targeting x64 the system would warn about this conversion. - Used static_casts to deal with enum-to-enum comparisons using different enum types. - return default typed Node in Messenger.h - Close off switch statements with a default clause. Co-authored-by: Mathew Benson <mathew@benson.co.ke>
1 parent c939ac6 commit 27ab2f4

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

Tetragrama/Components/DockspaceUIComponent.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace Tetragrama::Components
4040
m_editor_serializer->Initialize(parent->Arena);
4141
m_asset_importer->Initialize(parent->Arena);
4242

43-
m_dockspace_node_flag = ImGuiDockNodeFlags_NoWindowMenuButton | ImGuiDockNodeFlags_PassthruCentralNode;
43+
m_dockspace_node_flag = ImGuiDockNodeFlags_NoWindowMenuButton | static_cast<decltype(ImGuiDockNodeFlags_NoWindowMenuButton)>(ImGuiDockNodeFlags_PassthruCentralNode);
4444
m_window_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDocking | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoNavFocus;
4545

4646
auto app = reinterpret_cast<EditorPtr>(ParentLayer->CurrentApp);
@@ -211,7 +211,7 @@ namespace Tetragrama::Components
211211

212212
ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
213213
ImGui::SetCursorPos(ImVec2(10, ImGui::GetWindowSize().y - 30));
214-
ImGui::TextColored(s_asset_importer_report_msg_color, s_asset_importer_report_msg.c_str());
214+
ImGui::TextColored(s_asset_importer_report_msg_color, "%s", s_asset_importer_report_msg.c_str());
215215
ImGui::PopFont();
216216

217217
ImGui::EndPopup();
@@ -244,7 +244,7 @@ namespace Tetragrama::Components
244244

245245
ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[0]);
246246
ImGui::SetCursorPos(ImVec2(10, wind_size.y - 30));
247-
ImGui::TextColored(s_scene_serializer_log_color, s_scene_serializer_log);
247+
ImGui::TextColored(s_scene_serializer_log_color, "%s", s_scene_serializer_log);
248248
ImGui::PopFont();
249249

250250
ImGui::EndPopup();
@@ -385,7 +385,7 @@ namespace Tetragrama::Components
385385

386386
if (ImGui::BeginPopupModal(str_id, NULL, ImGuiWindowFlags_AlwaysAutoResize))
387387
{
388-
ImGui::Text(fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
388+
ImGui::Text("%s", fmt::format("You have unsaved changes for your current scene : {}", current_scene->Name).c_str());
389389
ImGui::Separator();
390390

391391
if (ImGui::Button("Save", ImVec2(120, 0)))

Tetragrama/Messengers/Messenger.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ namespace Tetragrama::Messengers
141141
// catch (...)
142142
//{
143143
//}
144+
return {};
144145
}
145146

146147
template <typename TRecipient, typename TMessage>

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,22 +721,22 @@ namespace ZEngine::Hardwares
721721

722722
VKAPI_ATTR VkBool32 VKAPI_CALL VulkanDevice::__debugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData)
723723
{
724-
if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
724+
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT)
725725
{
726726
ZENGINE_CORE_ERROR("{}", pCallbackData->pMessage)
727727
}
728728

729-
if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
729+
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT)
730730
{
731731
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
732732
}
733733

734-
if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
734+
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT)
735735
{
736736
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
737737
}
738738

739-
if ((messageSeverity & VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
739+
if ((messageSeverity & static_cast<decltype(messageSeverity)>(VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)) == VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT)
740740
{
741741
ZENGINE_CORE_WARN("{}", pCallbackData->pMessage)
742742
}
@@ -961,6 +961,8 @@ namespace ZEngine::Hardwares
961961
dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
962962
dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
963963
break;
964+
case UNKNOWN:
965+
break;
964966
}
965967

966968
VkBufferMemoryBarrier bufMemBarrier2 = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER};
@@ -1583,6 +1585,8 @@ namespace ZEngine::Hardwares
15831585
vkFreeDescriptorSets(LogicalDevice, reinterpret_cast<VkDescriptorPool>(res_handle.Data1), 1, &ds);
15841586
break;
15851587
}
1588+
case DeviceResourceType::RESOURCE_COUNT:
1589+
break;
15861590
}
15871591

15881592
DirtyResources.Remove(handle);
@@ -2360,7 +2364,7 @@ namespace ZEngine::Hardwares
23602364

23612365
void Image2DBuffer::Dispose()
23622366
{
2363-
if (this && m_buffer_image)
2367+
if (m_buffer_image)
23642368
{
23652369
Device->EnqueueBufferImageForDeletion(m_buffer_image);
23662370
m_buffer_image = {};
@@ -2498,6 +2502,8 @@ namespace ZEngine::Hardwares
24982502
dst_access_mask = VK_ACCESS_INDIRECT_COMMAND_READ_BIT;
24992503
dst_pipeline_stage = VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT;
25002504
break;
2505+
case UNKNOWN:
2506+
break;
25012507
}
25022508

25032509
auto command_buffer = m_device->GetInstantCommandBuffer(Rendering::QueueType::GRAPHIC_QUEUE);

ZEngine/ZEngine/Helpers/HandleManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ namespace ZEngine::Helpers
1818
template <typename T>
1919
struct Handle
2020
{
21-
uint32_t Index = UINT32_MAX;
21+
uint64_t Index = UINT64_MAX;
2222

2323
bool Valid() const
2424
{
25-
return Index != UINT32_MAX;
25+
return Index != UINT64_MAX;
2626
}
2727

2828
operator bool() const

0 commit comments

Comments
 (0)