commit 9639f83d83960f95e16ba815457d19b7076d0e6a
author Craig Stout <cstout@google.com> Tue Sep 19 17:34:15 2017 -0700
committer Craig Stout <cstout@google.com> Fri Sep 29 10:05:28 2017 -0700
tree 43fd7b38aa55a8a6c5e1148e60776c09d3f7a63a
parent 56bf1c7c0a623135880e353bd23e9062e2f13c7c

Remove VK_KHR_external_semaphore_fd

Change-Id: Ia31ccd42338f4c8aef50ed3242dc589ebcdbc80d

src/intel/vulkan/anv_device.c

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 57c3e1b..8ca5882 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -497,10 +497,6 @@
       .specVersion = 1,
    },
    {
-      .extensionName = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME,
-      .specVersion = 1,
-   },
-   {
       .extensionName = VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME,
       .specVersion = 1,
    },
@@ -2484,44 +2480,6 @@
    vk_free2(&device->alloc, pAllocator, semaphore);
 }
 
-VkResult anv_ImportSemaphoreFdKHR(VkDevice vk_device,
-                                  const VkImportSemaphoreFdInfoKHR* pImportSemaphoreFdInfo)
-{
-   assert(pImportSemaphoreFdInfo->sType == VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR);
-   assert(pImportSemaphoreFdInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR);
-
-   // TODO(MA-338): remove this, we shouldn't treat fds as handles
-   VkImportSemaphoreFuchsiaHandleInfoKHR info = {
-      .sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR,
-      .pNext = pImportSemaphoreFdInfo->pNext,
-      .semaphore = pImportSemaphoreFdInfo->semaphore,
-      .flags = pImportSemaphoreFdInfo->flags,
-      .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR,
-      .handle = pImportSemaphoreFdInfo->fd
-   };
-   return anv_ImportSemaphoreFuchsiaHandleKHR(vk_device, &info);
-}
-
-VkResult anv_GetSemaphoreFdKHR(VkDevice vk_device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, int* pFd)
-{
-   ANV_FROM_HANDLE(anv_device, device, vk_device);
-   assert(pGetFdInfo->sType == VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR);
-
-   VkSemaphoreGetFuchsiaHandleInfoKHR info = {
-      .sType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR,
-      .pNext = pGetFdInfo->pNext,
-      .semaphore = pGetFdInfo->semaphore,
-      .handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR
-   };
-
-   uint32_t handle;
-   VkResult result = anv_GetSemaphoreFuchsiaHandleKHR(vk_device, &info, &handle);
-   if (result == VK_SUCCESS)
-      *pFd = handle;
-
-   return result;
-}
-
 void anv_GetPhysicalDeviceExternalSemaphorePropertiesKHR(
     VkPhysicalDevice physicalDevice,
     const VkPhysicalDeviceExternalSemaphoreInfoKHR* pExternalSemaphoreInfo,