Update vulkan semaphore extension

Use fuchsia specific extension to avoid casting handles as fds.
CaseyHillers · Sep 26, 2017 · 9c518cb · 9c518cb
1 parent ccf9859
commit 9c518cb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/content_handler/vulkan_surface.cc b/content_handler/vulkan_surface.cc
@@ -100,15 +100,15 @@ vulkan::VulkanHandle<VkSemaphore> VulkanSurface::SemaphoreFromEvent(
     return vulkan::VulkanHandle<VkSemaphore>();
   }
 
-  VkImportSemaphoreFdInfoKHR import_info = {
-      .sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
+  VkImportSemaphoreFuchsiaHandleInfoKHR import_info = {
+      .sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR,
       .pNext = nullptr,
       .semaphore = semaphore,
-      .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR,
-      .fd = semaphore_event.release()};
+      .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR,
+      .handle = static_cast<uint32_t>(semaphore_event.release())};
 
-  result = VK_CALL_LOG_ERROR(
-      vk_.ImportSemaphoreFdKHR(backend_context_->fDevice, &import_info));
+  result = VK_CALL_LOG_ERROR(vk_.ImportSemaphoreFuchsiaHandleKHR(
+      backend_context_->fDevice, &import_info));
   if (result != VK_SUCCESS) {
     return vulkan::VulkanHandle<VkSemaphore>();
   }

diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
@@ -63,7 +63,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk,
 #if OS_FUCHSIA
     VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME,
     VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME,
-    VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
+    VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME,
 #endif
   };
 

diff --git a/vulkan/vulkan_proc_table.cc b/vulkan/vulkan_proc_table.cc
@@ -94,7 +94,7 @@ bool VulkanProcTable::SetupInstanceProcAddresses(
     ACQUIRE_PROC(CreateMagmaSurfaceKHR, handle);
     ACQUIRE_PROC(ExportDeviceMemoryMAGMA, handle);
     ACQUIRE_PROC(GetPhysicalDeviceMagmaPresentationSupportKHR, handle);
-    ACQUIRE_PROC(ImportSemaphoreFdKHR, handle);
+    ACQUIRE_PROC(ImportSemaphoreFuchsiaHandleKHR, handle);
     return true;
   }();
 #endif  // OS_FUCHSIA
@@ -147,7 +147,7 @@ bool VulkanProcTable::SetupDeviceProcAddresses(
   ACQUIRE_PROC(WaitForFences, handle);
 #if OS_FUCHSIA
   ACQUIRE_PROC(ExportDeviceMemoryMAGMA, handle);
-  ACQUIRE_PROC(ImportSemaphoreFdKHR, handle);
+  ACQUIRE_PROC(ImportSemaphoreFuchsiaHandleKHR, handle);
 #endif  // OS_FUCHSIA
   device_ = {handle, nullptr};
   return true;

diff --git a/vulkan/vulkan_proc_table.h b/vulkan/vulkan_proc_table.h
@@ -118,7 +118,7 @@ class VulkanProcTable : public fxl::RefCountedThreadSafe<VulkanProcTable> {
   DEFINE_PROC(CreateMagmaSurfaceKHR);
   DEFINE_PROC(ExportDeviceMemoryMAGMA);
   DEFINE_PROC(GetPhysicalDeviceMagmaPresentationSupportKHR);
-  DEFINE_PROC(ImportSemaphoreFdKHR);
+  DEFINE_PROC(ImportSemaphoreFuchsiaHandleKHR);
 #endif  // OS_FUCHSIA
 
 #undef DEFINE_PROC