don't try link vma if not use

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 867d49d690224c13a927156dfdc49f666d102bce..5563e16553c99c7c6d2a6d27327b19ea5b2d9dc0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,9 +72,13 @@ FUNCTION (setup_lib LibName)
             ${CMAKE_CURRENT_SOURCE_DIR}/include
                        ${Vulkan_INCLUDE_DIRS}
     )
+       if (VKH_USE_VMA)
+               TARGET_LINK_LIBRARIES("${LibName}"
+                       PRIVATE
+                               libVMA
+               )
+       ENDIF()
     TARGET_LINK_LIBRARIES("${LibName}"
-               PRIVATE
-                       libVMA
         PUBLIC
             ${Vulkan_LIBRARIES}
             Threads::Threads

diff --git a/src/vkh_image.c b/src/vkh_image.c
index b795a31dcd790c105e05f9432a60248bea7641e4..ca8ebc9ec3e56870c40a08e3fc119c35de981603 100644 (file)
--- a/src/vkh_image.c
+++ b/src/vkh_image.c
@@ -220,7 +220,7 @@ void vkh_image_set_layout(VkCommandBuffer cmdBuff, VkhImage image, VkImageAspect
        VkImageSubresourceRange subres = {aspectMask,0,1,0,1};
        vkh_image_set_layout_subres(cmdBuff, image, subres, old_image_layout, new_image_layout, src_stages, dest_stages);
 }
-
+// This method is based on https://github.com/SaschaWillems/Vulkan/blob/master/base/VulkanTools.h#L88
 void vkh_image_set_layout_subres(VkCommandBuffer cmdBuff, VkhImage image, VkImageSubresourceRange subresourceRange,
                                                         VkImageLayout old_image_layout, VkImageLayout new_image_layout,
                                                         VkPipelineStageFlags src_stages, VkPipelineStageFlags dest_stages) {

diff --git a/src/vkhelpers.c b/src/vkhelpers.c
index 2bf3454dbcb1034f94ac2b3e55494a3d34607f25..fa508e592b61e31e12c37482a9e21b1876878ada 100644 (file)
--- a/src/vkhelpers.c
+++ b/src/vkhelpers.c
@@ -395,6 +395,7 @@ void vkh_instance_extensions_check_init () {
 }
 void vkh_instance_extensions_check_release () {
     free (instExtProps);
+    instExtCount = 0;
 }
 
 static VkLayerProperties* instLayerProps;
@@ -413,4 +414,5 @@ void vkh_layers_check_init () {
 }
 void vkh_layers_check_release () {
     free (instLayerProps);
+    instance_layer_count = 0;
 }