aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/vk-api.cpp7
2 files changed, 5 insertions, 5 deletions
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