From 75ad278af19c4ee4e3cf49d1b9c13e1025dfb392 Mon Sep 17 00:00:00 2001
From: azhirnov <zh1dron@gmail.com>
Date: Wed, 16 Sep 2020 23:02:15 +0300
Subject: don't link with vulkan if used volk, added shader name to log message

---
 Graphics/GraphicsEngineVulkan/CMakeLists.txt       | 5 ++---
 Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Graphics/GraphicsEngineVulkan')

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)
-- 
cgit v1.2.3