From eccbd33af84084b6e31b45e8be6ef9be712d9456 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Sat, 12 Oct 2024 08:52:30 -0400 Subject: [PATCH] Fixes up a bunch of lib stuff --- cmake_modules/gcc.cmake | 6 +++--- dependencies/glfw3 | 2 +- dependencies/glm | 2 +- dependencies/shaderc | 2 +- dependencies/spdlog | 2 +- dependencies/tracy | 2 +- dependencies/vma | 2 +- src/engine/debug/logging/logging.hpp | 1 + src/engine/memory/buffers/vector/DeviceVector.hpp | 11 ++++++----- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cmake_modules/gcc.cmake b/cmake_modules/gcc.cmake index f6118fd..b6873d8 100644 --- a/cmake_modules/gcc.cmake +++ b/cmake_modules/gcc.cmake @@ -75,9 +75,9 @@ AppendFlag("-Wredundant-decls") #Warns about declarations that happen more then once. AppendFlag("-Wctor-dtor-privacy") #Warns if a class appears unusable due to private ctor/dtors AppendFlag("-Wdelete-non-virtual-dtor") #Warns about using `delete` on a class that has virtual functions without a virtual dtor - # Disabled because of older GCC compilers being unhappy with it AppendFlag("-Winvalid-constexpr") #Warns that a function marked as constexpr can't possibly produce a constexpr expression - AppendFlag("-Wnoexcept") #Warns when a noexcept expression is false due to throwing + # Disabled due to spdlog + #AppendFlag("-Wnoexcept") #Warns when a noexcept expression is false due to throwing AppendFlag("-Wnoexcept-type") AppendFlag("-Wclass-memaccess") #Warns about accessing memory of a class. Which is likely invalid AppendFlag("-Wregister") #Warns of use for `register` keyword. Which has been depreicated @@ -104,7 +104,7 @@ AppendFlag("-fdiagnostics-show-template-tree") # Shows the template diagnostic info as a tree instead. AppendFlag("-fdiagnostics-path-format=inline-events") - set(FGL_CONFIG "-std=c++23 -fmax-errors=6 -fconcepts-diagnostics-depth=8 -ftree-vectorize") + set(FGL_CONFIG "-std=c++23 -fmax-errors=3 -fconcepts-diagnostics-depth=8 -ftree-vectorize") if (DEFINED USE_WERROR) set(FGL_CONFIG "${FGL_CONFIG} -Werror") diff --git a/dependencies/glfw3 b/dependencies/glfw3 index 9959dc6..7b6aead 160000 --- a/dependencies/glfw3 +++ b/dependencies/glfw3 @@ -1 +1 @@ -Subproject commit 9959dc69cadd1f7790060846ffbc44e7da56fc56 +Subproject commit 7b6aead9fb88b3623e3b3725ebb42670cbe4c579 diff --git a/dependencies/glm b/dependencies/glm index 33b4a62..0af55cc 160000 --- a/dependencies/glm +++ b/dependencies/glm @@ -1 +1 @@ -Subproject commit 33b4a621a697a305bc3a7610d290677b96beb181 +Subproject commit 0af55ccecd98d4e5a8d1fad7de25ba429d60e863 diff --git a/dependencies/shaderc b/dependencies/shaderc index 5d0f6ed..ff84893 160000 --- a/dependencies/shaderc +++ b/dependencies/shaderc @@ -1 +1 @@ -Subproject commit 5d0f6ed6e46d3c0ccd23151c6a1486c2ec90c037 +Subproject commit ff84893dd52d28f0b1737d2635733d952013bd9c diff --git a/dependencies/spdlog b/dependencies/spdlog index c3aed4b..27cb4c7 160000 --- a/dependencies/spdlog +++ b/dependencies/spdlog @@ -1 +1 @@ -Subproject commit c3aed4b68373955e1cc94307683d44dca1515d2b +Subproject commit 27cb4c76708608465c413f6d0e6b8d99a4d84302 diff --git a/dependencies/tracy b/dependencies/tracy index 0c6803e..897aec5 160000 --- a/dependencies/tracy +++ b/dependencies/tracy @@ -1 +1 @@ -Subproject commit 0c6803e5c63ad0de2928c3313e9b20b1fb9c4ad6 +Subproject commit 897aec5b062664d2485f4f9a213715d2e527e0ca diff --git a/dependencies/vma b/dependencies/vma index 5e43c79..009ecd1 160000 --- a/dependencies/vma +++ b/dependencies/vma @@ -1 +1 @@ -Subproject commit 5e43c795daf43dd09398d8307212e85025215052 +Subproject commit 009ecd192c1289c7529bff248a16cfe896254816 diff --git a/src/engine/debug/logging/logging.hpp b/src/engine/debug/logging/logging.hpp index b393fab..c0ac1e4 100644 --- a/src/engine/debug/logging/logging.hpp +++ b/src/engine/debug/logging/logging.hpp @@ -8,6 +8,7 @@ #pragma GCC diagnostic ignored "-Wold-style-cast" #pragma GCC diagnostic ignored "-Weffc++" #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" +#pragma GCC diagnostic ignored "-Wnoexcept" #include #pragma GCC diagnostic pop diff --git a/src/engine/memory/buffers/vector/DeviceVector.hpp b/src/engine/memory/buffers/vector/DeviceVector.hpp index 1ee9e1f..f52ea56 100644 --- a/src/engine/memory/buffers/vector/DeviceVector.hpp +++ b/src/engine/memory/buffers/vector/DeviceVector.hpp @@ -7,8 +7,8 @@ #include "BufferVector.hpp" #include "concepts.hpp" #include "engine/assets/transfer/TransferManager.hpp" -#include "engine/math/literals/size.hpp" #include "engine/debug/logging/logging.hpp" +#include "engine/math/literals/size.hpp" namespace fgl::engine { @@ -16,7 +16,7 @@ namespace fgl::engine { class Buffer; } -} +} // namespace fgl::engine namespace fgl::engine { @@ -25,10 +25,11 @@ namespace fgl::engine { public: - DeviceVector( memory::Buffer& buffer, const std::uint32_t count = 1 ) : BufferVector( buffer, count, sizeof( T ) ) + DeviceVector( memory::Buffer& buffer, const std::uint32_t count = 1 ) : + BufferVector( buffer, count, sizeof( T ) ) { - log::debug( - "Creating DeviceVector of size {}", fgl::literals::size_literals::to_string( count * sizeof( T ) ) ); + const auto size_str { fgl::literals::size_literals::to_string( count * sizeof( T ) ) }; + log::debug( "Creating DeviceVector of size {}", size_str ); assert( count != 0 && "BufferSuballocationVector::BufferSuballocationVector() called with count == 0" ); }