summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorazhirnov <zh1dron@gmail.com>2020-08-19 16:05:48 +0000
committerazhirnov <zh1dron@gmail.com>2020-08-19 16:05:48 +0000
commitbdecaefe87db4ccfb8dc8700fb1bf23aff4b6a0d (patch)
treedd9d2191ea743af87b5f41abd5c2cf96917a5d5d /Graphics/GraphicsEngineVulkan
parentAdded root signature for DrawMeshIndirect, added some checks (diff)
downloadDiligentCore-bdecaefe87db4ccfb8dc8700fb1bf23aff4b6a0d.tar.gz
DiligentCore-bdecaefe87db4ccfb8dc8700fb1bf23aff4b6a0d.zip
minor fixes and formatting
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
index c6fffdee..51bb9dc5 100644
--- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt
+++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -245,7 +245,7 @@ elseif(PLATFORM_IOS)
find_library(UI_KIT UIKit)
list(APPEND PRIVATE_DEPENDENCIES ${CORE_GRAPHICS} ${METAL_LIBRARY} ${QUARTZ_CORE} ${UI_KIT})
elseif(PLATFORM_LINUX)
- find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "../../ThirdParty/vulkan/libs/linux")
+ # Use Volk
elseif(PLATFORM_ANDROID)
# Use Volk
else()
@@ -308,7 +308,7 @@ endif()
if(PLATFORM_WIN32)
set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_WIN32_KHR=1 NOMINMAX DILIGENT_USE_VOLK=1)
elseif(PLATFORM_LINUX)
- set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_XCB_KHR=1 VK_USE_PLATFORM_XLIB_KHR=1)
+ set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_XCB_KHR=1 VK_USE_PLATFORM_XLIB_KHR=1 DILIGENT_USE_VOLK=1)
elseif(PLATFORM_MACOS)
set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_MACOS_MVK=1)
elseif(PLATFORM_IOS)