From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Tue, 5 Sep 2023 21:06:11 +0000 (+0200)
Subject: don't try link vma if not use
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=0c9b7b9e6181a24673afcf4b87d850f405659308;p=jp%2Fvkhelpers.git

don't try link vma if not use
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 867d49d..5563e16 100644
--- 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 b795a31..ca8ebc9 100644
--- 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 2bf3454..fa508e5 100644
--- 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;
 }