From e1dec09eb1e19265692a0099e7b2acc60686c39e Mon Sep 17 00:00:00 2001 From: dom607 Date: Wed, 27 Feb 2019 17:17:29 +0900 Subject: Fix native window handle type. --- Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngineVulkan') 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 = {}; -- cgit v1.2.3 From 5db6ed8d940c822f1f17eb6657b39ef87bde85f8 Mon Sep 17 00:00:00 2001 From: dom607 Date: Wed, 27 Feb 2019 17:19:27 +0900 Subject: Added surface definition and find_library for android case --- Graphics/GraphicsEngineVulkan/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Graphics/GraphicsEngineVulkan') 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() -- cgit v1.2.3