mirror/VulkanMemoryAllocator
1
0
Fork 0
mirror of https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git synced 2024-11-25 16:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test not compiling shaders

Browse Source
This commit is contained in:
Ilya Doroshenko 2024-08-27 12:44:15 +02:00
parent 2683cfedc5
commit e962c8c83e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Shaders/CMakeLists.txt
View File

@ -17,14 +17,22 @@ foreach(SHADER ${SHADERS})
get_filename_component(FILE_NAME ${SHADER} NAME) get_filename_component(FILE_NAME ${SHADER} NAME)
# Put the .spv files into the bin folder # 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) set(SPIRV ${PROJECT_SOURCE_DIR}/bin/${FILE_NAME}.spv)
add_custom_command( add_custom_command(
OUTPUT ${SPIRV} OUTPUT ${SPIRV}
# Use the same file name and append .spv to the compiled shader # Use the same file name and append .spv to the compiled shader
COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV} COMMAND ${GLSL_VALIDATOR} -V ${CMAKE_CURRENT_SOURCE_DIR}/${SHADER} -o ${SPIRV}
DEPENDS ${SHADER} 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}) list(APPEND SPIRV_FILES ${SPIRV})
endforeach() endforeach()

2
src/Tests.cpp
View File

@ -8313,6 +8313,8 @@ static void TestWin32Handles()
vmaDestroyBuffer(g_hAllocator, buf, alloc); vmaDestroyBuffer(g_hAllocator, buf, alloc);
TEST(CloseHandle(handle)); TEST(CloseHandle(handle));
TEST(CloseHandle(handle2)); TEST(CloseHandle(handle2));
vmaDestroyPool(g_hAllocator, pool);
#endif #endif
} }

4
src/VulkanSample.cpp
View File

@ -32,7 +32,7 @@
#pragma comment(lib, "shlwapi.lib") #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 char* const SHADER_PATH2 = "../bin/";
static const wchar_t* const WINDOW_CLASS_NAME = L"VULKAN_MEMORY_ALLOCATOR_SAMPLE"; static const wchar_t* const WINDOW_CLASS_NAME = L"VULKAN_MEMORY_ALLOCATOR_SAMPLE";
static const char* const VALIDATION_LAYER_NAME = "VK_LAYER_KHRONOS_validation"; 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) else if(strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_MAINTENANCE_5_EXTENSION_NAME) == 0)
VK_KHR_maintenance5_enabled = true; VK_KHR_maintenance5_enabled = true;
else if (strcmp(physicalDeviceExtensionProperties[i].extensionName, VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME) == 0) 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) if(GetVulkanApiVersion() >= VK_API_VERSION_1_2)