diff options
| author | DiligentGraphics <admin@diligentgraphics.com> | 2019-02-27 15:20:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 15:20:14 +0000 |
| commit | 1481f573e6ef1eab0a2a543edd0a8fd794df94a6 (patch) | |
| tree | 384bfebdd155d920f24f70a3717e6722282383db /Graphics/GraphicsEngineVulkan | |
| parent | Fixed typo in LayoutElement structure (diff) | |
| parent | Added surface definition and find_library for android case (diff) | |
| download | DiligentCore-1481f573e6ef1eab0a2a543edd0a8fd794df94a6.tar.gz DiligentCore-1481f573e6ef1eab0a2a543edd0a8fd794df94a6.zip | |
Merge pull request #67 from StarshipVendingMachine/android-vulkan
Android vulkan
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index 18887fea..d41b809c 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -180,8 +180,10 @@ if(PLATFORM_WIN32) find_library(Vulkan_LIBRARY NAMES vulkan-1 vulkan PATHS "../../External/vulkan/libs") elseif(PLATFORM_MACOS) find_library(Vulkan_LIBRARY NAMES MoltenVK PATHS "../../External/vulkan/libs/macOS") -else() +elseif(PLATFORM_LINUX) find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "../../External/vulkan/libs/linux") +else() + find_library(Vulkan_LIBRARY NAMES vulkan) endif() list(APPEND PRIVATE_DEPENDENCIES ${Vulkan_LIBRARY}) @@ -219,6 +221,8 @@ elseif(PLATFORM_MACOS) set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_MACOS_MVK=1) elseif(PLATFORM_IOS) set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_IOS_MVK=1) +elseif(PLATFORM_ANDROID) + set(PRIVATE_COMPILE_DEFINITIONS VK_USE_PLATFORM_ANDROID_KHR=1) else() message(FATAL_ERROR "Unknown platform") endif() diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp index 27743a2e..a0ce2b23 100644 --- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp @@ -52,7 +52,7 @@ SwapChainVkImpl::SwapChainVkImpl(IReferenceCounters* pRefCounters, #elif defined(VK_USE_PLATFORM_ANDROID_KHR) VkAndroidSurfaceCreateInfoKHR surfaceCreateInfo = {}; surfaceCreateInfo.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; - surfaceCreateInfo.window = window; + surfaceCreateInfo.window = (ANativeWindow*) pNativeWndHandle; auto err = vkCreateAndroidSurfaceKHR(m_VulkanInstance->GetVkInstance(), &surfaceCreateInfo, NULL, &m_VkSurface); #elif defined(VK_USE_PLATFORM_IOS_MVK) VkIOSSurfaceCreateInfoMVK surfaceCreateInfo = {}; |