From e962c8c83e3e4f4b905f0bbc82cd4d4bffb86799 Mon Sep 17 00:00:00 2001
From: Ilya Doroshenko <ilya.doroshenko@kdab.com>
Date: Tue, 27 Aug 2024 12:44:15 +0200
Subject: [PATCH] Fixed test not compiling shaders

---
 src/Shaders/CMakeLists.txt | 8 ++++++++
 src/Tests.cpp              | 2 ++
 src/VulkanSample.cpp       | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt
index f85ab78..0998924 100644
--- a/src/Shaders/CMakeLists.txt
+++ b/src/Shaders/CMakeLists.txt
@@ -17,14 +17,22 @@ foreach(SHADER ${SHADERS})
     get_filename_component(FILE_NAME ${SHADER} NAME)
     
     # Put the .spv files into the bin folder
+    set(SPIRV_BIN ${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.spv)
     set(SPIRV ${PROJECT_SOURCE_DIR}/bin/${FILE_NAME}.spv)
 
+
     add_custom_command(
         OUTPUT ${SPIRV}
         # Use the same file name and append .spv to the compiled shader
         COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV}
         DEPENDS ${SHADER}
     )
+    add_custom_command(
+        OUTPUT ${SPIRV_BIN}
+        # Use the same file name and append .spv to the compiled shader
+        COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV_BIN}
+        DEPENDS ${SHADER}
+    )
 
     list(APPEND SPIRV_FILES ${SPIRV})
 endforeach()
diff --git a/src/Tests.cpp b/src/Tests.cpp
index bb6650f..853b56a 100644
--- a/src/Tests.cpp
+++ b/src/Tests.cpp
@@ -8313,6 +8313,8 @@ static void TestWin32Handles()
     vmaDestroyBuffer(g_hAllocator, buf, alloc);
     TEST(CloseHandle(handle));
     TEST(CloseHandle(handle2));
+
+    vmaDestroyPool(g_hAllocator, pool);
 #endif
 }
 
diff --git a/src/VulkanSample.cpp b/src/VulkanSample.cpp
index 480b325..b3df053 100644
--- a/src/VulkanSample.cpp
+++ b/src/VulkanSample.cpp
@@ -32,7 +32,7 @@
 
 #pragma comment(lib, "shlwapi.lib")
 
-static const char* const SHADER_PATH1 = "./";
+static const char* const SHADER_PATH1 = "./Shaders/";
 static const char* const SHADER_PATH2 = "../bin/";
 static const wchar_t* const WINDOW_CLASS_NAME = L"VULKAN_MEMORY_ALLOCATOR_SAMPLE";
 static const char* const VALIDATION_LAYER_NAME = "VK_LAYER_KHRONOS_validation";
@@ -1884,7 +1884,7 @@ static void InitializeApplication()
         else if(strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_MAINTENANCE_5_EXTENSION_NAME) == 0)
             VK_KHR_maintenance5_enabled = true;
         else if (strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME) == 0)
-            VK_KHR_external_memory_win32_enabled = true;
+            VK_KHR_external_memory_win32_enabled = VMA_DYNAMIC_VULKAN_FUNCTIONS;
     }
 
     if(GetVulkanApiVersion() >= VK_API_VERSION_1_2)