diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-16 20:02:15 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-16 20:02:38 +0000 |
| commit | 75ad278af19c4ee4e3cf49d1b9c13e1025dfb392 (patch) | |
| tree | fff96050dfd9f598bb2e0b59d0d7861d27e385ab /Graphics/GraphicsEngineVulkan | |
| parent | remove some VK_NV_mesh_shader (diff) | |
| download | DiligentCore-75ad278af19c4ee4e3cf49d1b9c13e1025dfb392.tar.gz DiligentCore-75ad278af19c4ee4e3cf49d1b9c13e1025dfb392.zip | |
don't link with vulkan if used volk, added shader name to log message
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index 8299915a..897894e7 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -233,8 +233,10 @@ if(PLATFORM_WIN32) # Use Volk elseif(PLATFORM_MACOS) find_library(Vulkan_LIBRARY NAMES vulkan.1 vulkan PATHS "../../ThirdParty/vulkan/libs/macOS") + list(APPEND PRIVATE_DEPENDENCIES ${Vulkan_LIBRARY}) elseif(PLATFORM_IOS) set(Vulkan_LIBRARY ${MoltenVK_LIBRARY}) + list(APPEND PRIVATE_DEPENDENCIES ${Vulkan_LIBRARY}) find_library(CORE_GRAPHICS CoreGraphics) find_library(METAL_LIBRARY Metal) @@ -248,9 +250,6 @@ elseif(PLATFORM_ANDROID) # Use Volk else() find_library(Vulkan_LIBRARY NAMES vulkan) -endif() - -if(Vulkan_LIBRARY) list(APPEND PRIVATE_DEPENDENCIES ${Vulkan_LIBRARY}) endif() diff --git a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp index c16010d8..15db694e 100644 --- a/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp @@ -115,7 +115,7 @@ ShaderVkImpl::ShaderVkImpl(IReferenceCounters* pRefCounters, if (m_SPIRV.empty()) { - LOG_ERROR_AND_THROW("Failed to compile shader"); + LOG_ERROR_AND_THROW("Failed to compile shader \"", CreationAttribs.Desc.Name, "\""); } } else if (CreationAttribs.ByteCode != nullptr) |