From 1ca8afa1bc0fb7a2b3951ab8d4c0080ea060da81 Mon Sep 17 00:00:00 2001 From: Craig Stout Date: Mon, 25 Mar 2019 10:25:32 -0700 Subject: [PATCH] [vulkan] Add FUCHSIA external sem/mem extensions The KHR versions will be renamed once references are removed. MA-510 #comment --- engine/src/flutter/vulkan/vulkan_device.cc | 2 ++ engine/src/flutter/vulkan/vulkan_proc_table.cc | 2 ++ engine/src/flutter/vulkan/vulkan_proc_table.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/engine/src/flutter/vulkan/vulkan_device.cc b/engine/src/flutter/vulkan/vulkan_device.cc index 772b1909225..3be8c340cda 100644 --- a/engine/src/flutter/vulkan/vulkan_device.cc +++ b/engine/src/flutter/vulkan/vulkan_device.cc @@ -64,8 +64,10 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk, #if OS_FUCHSIA VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME, VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME, + VK_FUCHSIA_EXTERNAL_MEMORY_EXTENSION_NAME, VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME, VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME, + VK_FUCHSIA_EXTERNAL_SEMAPHORE_EXTENSION_NAME, #endif }; diff --git a/engine/src/flutter/vulkan/vulkan_proc_table.cc b/engine/src/flutter/vulkan/vulkan_proc_table.cc index b94e1ab4b23..7b551f3d550 100644 --- a/engine/src/flutter/vulkan/vulkan_proc_table.cc +++ b/engine/src/flutter/vulkan/vulkan_proc_table.cc @@ -139,6 +139,8 @@ bool VulkanProcTable::SetupDeviceProcAddresses( #if OS_FUCHSIA ACQUIRE_PROC(GetMemoryFuchsiaHandleKHR, handle); ACQUIRE_PROC(ImportSemaphoreFuchsiaHandleKHR, handle); + ACQUIRE_PROC(GetMemoryZirconHandleFUCHSIA, handle); + ACQUIRE_PROC(ImportSemaphoreZirconHandleFUCHSIA, handle); #endif // OS_FUCHSIA device_ = {handle, nullptr}; return true; diff --git a/engine/src/flutter/vulkan/vulkan_proc_table.h b/engine/src/flutter/vulkan/vulkan_proc_table.h index d145150bcf8..9f06402e3dd 100644 --- a/engine/src/flutter/vulkan/vulkan_proc_table.h +++ b/engine/src/flutter/vulkan/vulkan_proc_table.h @@ -117,6 +117,8 @@ class VulkanProcTable : public fml::RefCountedThreadSafe { #if OS_FUCHSIA DEFINE_PROC(GetMemoryFuchsiaHandleKHR); DEFINE_PROC(ImportSemaphoreFuchsiaHandleKHR); + DEFINE_PROC(GetMemoryZirconHandleFUCHSIA); + DEFINE_PROC(ImportSemaphoreZirconHandleFUCHSIA); #endif // OS_FUCHSIA #undef DEFINE_PROC