Skip to content

Commit aa5da98

Browse files
committed
feat: auto copy validation layers and load in runtime
1 parent dfbb011 commit aa5da98

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

Engine/Source/RHI-Vulkan/Src/Instance.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,7 @@ namespace RHI::Vulkan {
8787
#if BUILD_CONFIG_DEBUG
8888
void VulkanInstance::PrepareLayers()
8989
{
90-
#if PLATFORM_WINDOWS
9190
Common::PlatformUtils::SetEnvVar("VK_LAYER_PATH", "VkLayer_khronos_validation.json");
92-
#else
93-
// TODO
94-
#endif
9591

9692
uint32_t supportedLayerCount = 0;
9793
vkEnumerateInstanceLayerProperties(&supportedLayerCount, nullptr);

ThirdParty/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
2727
set_target_properties(libclang::libclang PROPERTIES RUNTIME_DEP "${libclang_INCLUDE_DIR}/../bin/libclang.dll")
2828
set_target_properties(dxc::dxc PROPERTIES RUNTIME_DEP "${dxc_INCLUDE_DIR}/../bin/dxil.dll;${dxc_INCLUDE_DIR}/../bin/dxcompiler.dll")
2929
set_target_properties(vulkan-validationlayers::vulkan-validationlayers PROPERTIES RUNTIME_DEP "${VulkanValidationLayers_INCLUDE_DIR}/../bin/VkLayer_khronos_validation.dll;${VulkanValidationLayers_INCLUDE_DIR}/../bin/VkLayer_khronos_validation.json")
30+
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
31+
set_target_properties(vulkan-validationlayers::vulkan-validationlayers PROPERTIES RUNTIME_DEP "${VulkanValidationLayers_INCLUDE_DIR}/../lib/libVkLayer_khronos_validation.dylib;${VulkanValidationLayers_INCLUDE_DIR}/../share/vulkan/explicit_layer.d/VkLayer_khronos_validation.json")
3032
endif ()
3133

3234
# TODO macos vulkan validation layers runtime dep

0 commit comments

Comments
 (0)