Switch external memory/semaphore tests to new extensions
The extensions have been renamed, so we should be testing the new
implementations instead of the old ones.
Change-Id: Ifaad24c452caaf4a1786cc580a7da887df72edf1
diff --git a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
index 1951645..550098f 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
@@ -285,14 +285,14 @@
deviceExtensions.push_back("VK_KHR_external_fence_win32");
}
- if (externalMemoryTypes & vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR)
+ if (externalMemoryTypes & vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA)
{
- deviceExtensions.push_back("VK_KHR_external_memory_fuchsia");
+ deviceExtensions.push_back("VK_FUCHSIA_external_memory");
}
- if (externalSemaphoreTypes & vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR)
+ if (externalSemaphoreTypes & vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA)
{
- deviceExtensions.push_back("VK_KHR_external_semaphore_fuchsia");
+ deviceExtensions.push_back("VK_FUCHSIA_external_semaphore");
}
if ((externalMemoryTypes
@@ -4201,7 +4201,7 @@
semaphoreGroup->addChild(createSemaphoreTests(testCtx, vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT).release());
semaphoreGroup->addChild(createSemaphoreTests(testCtx, vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT).release());
semaphoreGroup->addChild(createSemaphoreTests(testCtx, vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT).release());
- semaphoreGroup->addChild(createSemaphoreTests(testCtx, vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR).release());
+ semaphoreGroup->addChild(createSemaphoreTests(testCtx, vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA).release());
return semaphoreGroup;
}
@@ -4306,7 +4306,7 @@
group->addChild(createMemoryTests(testCtx, vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT).release());
group->addChild(createMemoryTests(testCtx, vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT).release());
group->addChild(createMemoryTests(testCtx, vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID).release());
- group->addChild(createMemoryTests(testCtx, vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR).release());
+ group->addChild(createMemoryTests(testCtx, vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA).release());
return group;
}
diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
index 13277da..da3563e 100644
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
@@ -433,11 +433,11 @@
extensions.push_back("VK_KHR_external_memory_fd");
}
- if (memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR
- || semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR)
+ if (memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA
+ || semaphoreHandleType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA)
{
- extensions.push_back("VK_KHR_external_semaphore_fuchsia");
- extensions.push_back("VK_KHR_external_memory_fuchsia");
+ extensions.push_back("VK_FUCHSIA_external_semaphore");
+ extensions.push_back("VK_FUCHSIA_external_memory");
}
if (memoryHandleType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
@@ -1317,9 +1317,9 @@
"_win32"
},
{
- vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR,
- vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR,
- "_fuchsia_handle"
+ vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA,
+ vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA,
+ "_zircon_handle"
},
};
de::MovePtr<tcu::TestCaseGroup> group (new tcu::TestCaseGroup(testCtx, "cross_instance", ""));
diff --git a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
index 1087d39..5efc2e7 100644
--- a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
+++ b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.cpp
@@ -76,7 +76,7 @@
NativeHandle::NativeHandle (void)
: m_fd (-1)
- , m_fuchsiaHandle (0)
+ , m_zirconHandle (0)
, m_win32HandleType (WIN32HANDLETYPE_LAST)
, m_win32Handle (DE_NULL)
, m_androidHardwareBuffer (DE_NULL)
@@ -85,7 +85,7 @@
NativeHandle::NativeHandle (const NativeHandle& other)
: m_fd (-1)
- , m_fuchsiaHandle (0)
+ , m_zirconHandle (0)
, m_win32HandleType (WIN32HANDLETYPE_LAST)
, m_win32Handle (DE_NULL)
, m_androidHardwareBuffer (DE_NULL)
@@ -101,13 +101,13 @@
DE_FATAL("Platform doesn't support file descriptors");
#endif
}
- else if (other.m_fuchsiaHandle)
+ else if (other.m_zirconHandle.internal)
{
#if (DE_OS == DE_OS_FUCHSIA)
DE_ASSERT(!other.m_win32Handle.internal);
- zx_handle_duplicate(other.m_fuchsiaHandle, ZX_RIGHT_SAME_RIGHTS, &m_fuchsiaHandle);
+ zx_handle_duplicate(other.m_zirconHandle.internal, ZX_RIGHT_SAME_RIGHTS, &m_zirconHandle.internal);
#else
- DE_FATAL("Platform doesn't support fuchsia handles");
+ DE_FATAL("Platform doesn't support zircon handles");
#endif
}
else if (other.m_win32Handle.internal)
@@ -154,7 +154,7 @@
NativeHandle::NativeHandle (int fd)
: m_fd (fd)
- , m_fuchsiaHandle (0)
+ , m_zirconHandle (DE_NULL)
, m_win32HandleType (WIN32HANDLETYPE_LAST)
, m_win32Handle (DE_NULL)
, m_androidHardwareBuffer (DE_NULL)
@@ -163,7 +163,7 @@
NativeHandle::NativeHandle (Win32HandleType handleType, vk::pt::Win32Handle handle)
: m_fd (-1)
- , m_fuchsiaHandle (0)
+ , m_zirconHandle (0)
, m_win32HandleType (handleType)
, m_win32Handle (handle)
, m_androidHardwareBuffer (DE_NULL)
@@ -172,7 +172,7 @@
NativeHandle::NativeHandle (vk::pt::AndroidHardwareBufferPtr buffer)
: m_fd (-1)
- , m_fuchsiaHandle (0)
+ , m_zirconHandle (0)
, m_win32HandleType (WIN32HANDLETYPE_LAST)
, m_win32Handle (DE_NULL)
, m_androidHardwareBuffer (buffer)
@@ -197,9 +197,9 @@
#endif
}
- if (m_fuchsiaHandle > 0) {
+ if (m_zirconHandle.internal > 0) {
#if (DE_OS == DE_OS_FUCHSIA)
- zx_handle_close(m_fuchsiaHandle);
+ zx_handle_close(m_zirconHandle.internal);
#else
DE_FATAL("Platform doesn't support fuchsia handles");
#endif
@@ -234,7 +234,7 @@
AndroidHardwareBufferExternalApi::getInstance()->release(m_androidHardwareBuffer);
}
m_fd = -1;
- m_fuchsiaHandle = 0;
+ m_zirconHandle = vk::pt::ZXHandle(0);
m_win32Handle = vk::pt::Win32Handle(DE_NULL);
m_win32HandleType = WIN32HANDLETYPE_LAST;
m_androidHardwareBuffer = vk::pt::AndroidHardwareBufferPtr(DE_NULL);
@@ -266,17 +266,17 @@
m_win32Handle = handle;
}
-void NativeHandle::setFuchsiaHandle (uint32_t fuchsiaHandle)
+void NativeHandle::setZirconHandle (vk::pt::ZXHandle zirconHandle)
{
reset();
- m_fuchsiaHandle = fuchsiaHandle;
+ m_zirconHandle = zirconHandle;
}
void NativeHandle::disown (void)
{
m_fd = -1;
- m_fuchsiaHandle = 0;
+ m_zirconHandle = vk::pt::ZXHandle(0);
m_win32Handle = vk::pt::Win32Handle(DE_NULL);
m_androidHardwareBuffer = vk::pt::AndroidHardwareBufferPtr(DE_NULL);
}
@@ -295,11 +295,12 @@
return m_fd;
}
-uint32_t NativeHandle::getFuchsiaHandle (void) const
+vk::pt::ZXHandle NativeHandle::getZirconHandle (void) const
{
DE_ASSERT(!m_win32Handle.internal);
+ DE_ASSERT(!m_androidHardwareBuffer.internal);
- return m_fuchsiaHandle;
+ return m_zirconHandle;
}
@@ -329,8 +330,8 @@
case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT:
return "sync_fd";
- case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR:
- return "fuchsia_fence";
+ case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA:
+ return "zircon_event";
default:
DE_FATAL("Unknown external semaphore type");
@@ -388,8 +389,8 @@
case vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID:
return "android_hardware_buffer";
- case vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR:
- return "fuchsia_vmo";
+ case vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA:
+ return "zircon_vmo";
default:
@@ -413,7 +414,7 @@
case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT:
return permanence == PERMANENCE_TEMPORARY;
- case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR:
+ case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA:
return permanence == PERMANENCE_PERMANENT || permanence == PERMANENCE_TEMPORARY;
default:
@@ -436,7 +437,7 @@
case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT:
return TRANSFERENCE_COPY;
- case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR:
+ case vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA:
return TRANSFERENCE_REFERENCE;
default:
@@ -529,20 +530,20 @@
TCU_CHECK(fd >= 0);
nativeHandle = fd;
}
- else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR)
+ else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA)
{
- const vk::VkMemoryGetFuchsiaHandleInfoKHR info =
+ const vk::VkMemoryGetZirconHandleInfoFUCHSIA info =
{
- vk::VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR,
+ vk::VK_STRUCTURE_TYPE_TEMP_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA,
DE_NULL,
memory,
externalType
};
- uint32_t fuchsiaHandle = -1;
+ vk::pt::ZXHandle handle(0);
- VK_CHECK(vkd.getMemoryFuchsiaHandleKHR(device, &info, &fuchsiaHandle));
- nativeHandle.setFuchsiaHandle(fuchsiaHandle);
+ VK_CHECK(vkd.getMemoryZirconHandleFUCHSIA(device, &info, &handle));
+ nativeHandle.setZirconHandle(handle);
}
else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
|| externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT)
@@ -815,20 +816,20 @@
TCU_CHECK(fd >= 0);
nativeHandle = fd;
}
- else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR)
+ else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA)
{
- const vk::VkSemaphoreGetFuchsiaHandleInfoKHR info =
+ const vk::VkSemaphoreGetZirconHandleInfoFUCHSIA info =
{
- vk::VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR,
+ vk::VK_STRUCTURE_TYPE_TEMP_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA,
DE_NULL,
semaphore,
externalType
};
- unsigned int fuchsiaHandle = 0;
+ vk::pt::ZXHandle zirconHandle(0);
- VK_CHECK(vkd.getSemaphoreFuchsiaHandleKHR(device, &info, &fuchsiaHandle));
- nativeHandle.setFuchsiaHandle(fuchsiaHandle);
+ VK_CHECK(vkd.getSemaphoreZirconHandleFUCHSIA(device, &info, &zirconHandle));
+ nativeHandle.setZirconHandle(zirconHandle);
}
else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT
|| externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT)
@@ -886,19 +887,19 @@
VK_CHECK(vkd.importSemaphoreFdKHR(device, &importInfo));
handle.disown();
}
- else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR)
+ else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA)
{
- const vk::VkImportSemaphoreFuchsiaHandleInfoKHR importInfo =
+ const vk::VkImportSemaphoreZirconHandleInfoFUCHSIA importInfo =
{
- vk::VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR,
+ vk::VK_STRUCTURE_TYPE_TEMP_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA,
DE_NULL,
semaphore,
flags,
externalType,
- handle.getFuchsiaHandle()
+ handle.getZirconHandle()
};
- VK_CHECK(vkd.importSemaphoreFuchsiaHandleKHR(device, &importInfo));
+ VK_CHECK(vkd.importSemaphoreZirconHandleFUCHSIA(device, &importInfo));
handle.disown();
}
else if (externalType == vk::VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT
@@ -1089,14 +1090,14 @@
return memory;
}
- else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR)
+ else if (externalType == vk::VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA)
{
- const vk::VkImportMemoryFuchsiaHandleInfoKHR importInfo =
+ const vk::VkImportMemoryZirconHandleInfoFUCHSIA importInfo =
{
- vk::VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR,
+ vk::VK_STRUCTURE_TYPE_TEMP_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA,
DE_NULL,
externalType,
- handle.getFuchsiaHandle()
+ handle.getZirconHandle()
};
const vk::VkMemoryDedicatedAllocateInfo dedicatedInfo =
{
diff --git a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
index 61ff512..6a9c611 100644
--- a/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
+++ b/external/vulkancts/modules/vulkan/util/vktExternalMemoryUtil.hpp
@@ -52,19 +52,19 @@
NativeHandle& operator= (int fd);
NativeHandle& operator= (vk::pt::AndroidHardwareBufferPtr buffer);
- void setFuchsiaHandle(uint32_t fuchsiaHandle);
+ void setZirconHandle (vk::pt::ZXHandle zirconHandle);
void setWin32Handle (Win32HandleType type, vk::pt::Win32Handle handle);
vk::pt::Win32Handle getWin32Handle (void) const;
int getFd (void) const;
vk::pt::AndroidHardwareBufferPtr getAndroidHardwareBuffer (void) const;
- uint32_t getFuchsiaHandle(void) const;
+ vk::pt::ZXHandle getZirconHandle(void) const;
void disown (void);
void reset (void);
private:
int m_fd;
- uint32_t m_fuchsiaHandle;
+ vk::pt::ZXHandle m_zirconHandle;
Win32HandleType m_win32HandleType;
vk::pt::Win32Handle m_win32Handle;
vk::pt::AndroidHardwareBufferPtr m_androidHardwareBuffer;
