From dcb7c5c79260ca9ccac4ba4e4a76e0056c3f96c1 Mon Sep 17 00:00:00 2001
From: ladevieq <ladevie.quentin@gmail.com>
Date: Mon, 28 Feb 2022 14:54:06 +0100
Subject: Setup clang-tidy using clangd

---
 .clangd            | 7 +++++++
 .gitignore         | 1 -
 src/CMakeLists.txt | 3 +--
 src/vk-api.cpp     | 7 ++++---
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .clangd

diff --git a/.clangd b/.clangd
new file mode 100644
index 0000000..18142d9
--- /dev/null
+++ b/.clangd
@@ -0,0 +1,7 @@
+Diagnostics:
+#  UnusedIncludes: Strict // clangd 14
+  ClangTidy:
+    Add: [performance*, modernize*, readability*, bugprone*]
+    Remove: [modernize-avoir-c-arrays]
+# InlayHints: // clangd 14
+#  Enabled: Yes // clangd 14
diff --git a/.gitignore b/.gitignore
index 208e889..6565d3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /build
 /out
 /.vs
-/.clangd
 /.cache
 compile_commands.json
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c91cb83..2956cb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,7 @@ if(UNIX AND NOT APPLE)
     include_directories(${X11_xcb_INCLUDE_PATH})
 endif()
 
-set(LIBRARIES imgui::imgui)
+set(LIBRARIES imgui::imgui nlohmann_json::nlohmann_json)
 
 add_executable(
     path-tracer
@@ -31,4 +31,3 @@ if(UNIX AND NOT APPLE)
 endif()
 
 target_link_libraries(path-tracer PRIVATE ${LIBRARIES})
-target_link_libraries(path-tracer PRIVATE nlohmann_json nlohmann_json::nlohmann_json)
diff --git a/src/vk-api.cpp b/src/vk-api.cpp
index 226314a..0d26e49 100644
--- a/src/vk-api.cpp
+++ b/src/vk-api.cpp
@@ -135,13 +135,14 @@ vkapi::vkapi() {
 
 vkapi::~vkapi() {
     // Free resources
-    while (buffers.size())
+    while (buffers.empty()) {
         destroy_buffer(buffers.begin()->second);
+    }
 
-    while (images.size())
+    while (images.empty())
         destroy_image(images.begin()->second);
 
-    while (samplers.size())
+    while (samplers.empty())
         destroy_sampler(samplers.begin()->second);
 
     // Free bindless descriptor stuff
-- 
cgit v1.3