Remove old Fuchsia KHR external mem,sem extensions
Change-Id: I09455f0d18ea618984f2f42ccacae10f23052e17
diff --git a/build-fuchsia/Vulkan-Docs.diff b/build-fuchsia/Vulkan-Docs.diff
index 5ca58a8..9b97928 100644
--- a/build-fuchsia/Vulkan-Docs.diff
+++ b/build-fuchsia/Vulkan-Docs.diff
@@ -36,9 +36,8 @@
- [ 'vulkan_fuchsia.h', [ 'VK_FUCHSIA_imagepipe_surface'], commonSuppressExtensions ],
+ [ 'vulkan_fuchsia.h', [ 'VK_KHR_magma_surface',
+ 'VK_FUCHSIA_imagepipe_surface',
-+ 'VK_GOOGLE_image_usage_scanout',
-+ 'VK_KHR_external_memory_fuchsia',
-+ 'VK_KHR_external_semaphore_fuchsia',
++ 'VK_FUCHSIA_external_memory',
++ 'VK_FUCHSIA_external_semaphore',
+ 'VK_FUCHSIA_buffer_collection'], commonSuppressExtensions ],
[ 'vulkan_ios.h', [ 'VK_MVK_ios_surface' ], commonSuppressExtensions ],
[ 'vulkan_macos.h', [ 'VK_MVK_macos_surface' ], commonSuppressExtensions ],
diff --git a/build-fuchsia/generated/include/object_tracker.cpp b/build-fuchsia/generated/include/object_tracker.cpp
index 2a72629..80a6ac8 100644
--- a/build-fuchsia/generated/include/object_tracker.cpp
+++ b/build-fuchsia/generated/include/object_tracker.cpp
@@ -4224,91 +4224,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- bool skip = false;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- if (pGetFuchsiaHandleInfo) {
- skip |= ValidateObject(device, pGetFuchsiaHandleInfo->memory, kVulkanObjectTypeDeviceMemory, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- }
- }
- if (skip) return VK_ERROR_VALIDATION_FAILED_EXT;
- VkResult result = get_dispatch_table(ot_device_table_map, device)->GetMemoryFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
-
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties)
-{
- bool skip = false;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- }
- if (skip) return VK_ERROR_VALIDATION_FAILED_EXT;
- VkResult result = get_dispatch_table(ot_device_table_map, device)->GetMemoryFuchsiaHandlePropertiesKHR(device, handleType, fuchsiaHandle, pMemoryFuchsiaHandleProperties);
-
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo)
-{
- bool skip = false;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- if (pImportSemaphoreFuchsiaHandleInfo) {
- skip |= ValidateObject(device, pImportSemaphoreFuchsiaHandleInfo->semaphore, kVulkanObjectTypeSemaphore, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- }
- }
- if (skip) return VK_ERROR_VALIDATION_FAILED_EXT;
- VkResult result = get_dispatch_table(ot_device_table_map, device)->ImportSemaphoreFuchsiaHandleKHR(device, pImportSemaphoreFuchsiaHandleInfo);
-
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- bool skip = false;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- skip |= ValidateObject(device, device, kVulkanObjectTypeDevice, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- if (pGetFuchsiaHandleInfo) {
- skip |= ValidateObject(device, pGetFuchsiaHandleInfo->semaphore, kVulkanObjectTypeSemaphore, false, VALIDATION_ERROR_UNDEFINED, VALIDATION_ERROR_UNDEFINED);
- }
- }
- if (skip) return VK_ERROR_VALIDATION_FAILED_EXT;
- VkResult result = get_dispatch_table(ot_device_table_map, device)->GetSemaphoreFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
-
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
VKAPI_ATTR VkResult VKAPI_CALL CreateMagmaSurfaceKHR(
VkInstance instance,
const VkMagmaSurfaceCreateInfoKHR* pCreateInfo,
@@ -5723,18 +5638,6 @@
{"vkBindImageMemory2KHR", (void*)BindImageMemory2KHR},
{"vkGetDescriptorSetLayoutSupportKHR", (void*)GetDescriptorSetLayoutSupportKHR},
#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandleKHR", (void*)GetMemoryFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandlePropertiesKHR", (void*)GetMemoryFuchsiaHandlePropertiesKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkImportSemaphoreFuchsiaHandleKHR", (void*)ImportSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetSemaphoreFuchsiaHandleKHR", (void*)GetSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", (void*)CreateMagmaSurfaceKHR},
#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
diff --git a/build-fuchsia/generated/include/parameter_validation.cpp b/build-fuchsia/generated/include/parameter_validation.cpp
index 9189dc4..d082e37 100644
--- a/build-fuchsia/generated/include/parameter_validation.cpp
+++ b/build-fuchsia/generated/include/parameter_validation.cpp
@@ -77,9 +77,9 @@
const VkExternalFenceFeatureFlags AllVkExternalFenceFeatureFlagBits = VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR;
const VkExternalFenceHandleTypeFlags AllVkExternalFenceHandleTypeFlagBits = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR;
const VkExternalMemoryFeatureFlags AllVkExternalMemoryFeatureFlagBits = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT|VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
-const VkExternalMemoryHandleTypeFlags AllVkExternalMemoryHandleTypeFlagBits = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA;
+const VkExternalMemoryHandleTypeFlags AllVkExternalMemoryHandleTypeFlagBits = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA;
const VkExternalSemaphoreFeatureFlags AllVkExternalSemaphoreFeatureFlagBits = VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR;
-const VkExternalSemaphoreHandleTypeFlags AllVkExternalSemaphoreHandleTypeFlagBits = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
+const VkExternalSemaphoreHandleTypeFlags AllVkExternalSemaphoreHandleTypeFlagBits = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
const VkFenceImportFlags AllVkFenceImportFlagBits = VK_FENCE_IMPORT_TEMPORARY_BIT|VK_FENCE_IMPORT_TEMPORARY_BIT_KHR;
const VkMemoryAllocateFlags AllVkMemoryAllocateFlagBits = VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT|VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHR;
const VkPeerMemoryFeatureFlags AllVkPeerMemoryFeatureFlagBits = VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT|VK_PEER_MEMORY_FEATURE_COPY_DST_BIT|VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT|VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT|VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT_KHR|VK_PEER_MEMORY_FEATURE_COPY_DST_BIT_KHR|VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT_KHR|VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHR;
@@ -93,9 +93,9 @@
const VkMemoryAllocateFlagsKHR AllVkMemoryAllocateFlagBitsKHR = VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT|VK_MEMORY_ALLOCATE_DEVICE_MASK_BIT_KHR;
const VkPeerMemoryFeatureFlagsKHR AllVkPeerMemoryFeatureFlagBitsKHR = VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT|VK_PEER_MEMORY_FEATURE_COPY_DST_BIT|VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT|VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT|VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT_KHR|VK_PEER_MEMORY_FEATURE_COPY_DST_BIT_KHR|VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT_KHR|VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT_KHR;
const VkExternalMemoryFeatureFlagsKHR AllVkExternalMemoryFeatureFlagBitsKHR = VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT|VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR;
-const VkExternalMemoryHandleTypeFlagsKHR AllVkExternalMemoryHandleTypeFlagBitsKHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA;
+const VkExternalMemoryHandleTypeFlagsKHR AllVkExternalMemoryHandleTypeFlagBitsKHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT_KHR|VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT|VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA;
const VkExternalSemaphoreFeatureFlagsKHR AllVkExternalSemaphoreFeatureFlagBitsKHR = VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR;
-const VkExternalSemaphoreHandleTypeFlagsKHR AllVkExternalSemaphoreHandleTypeFlagBitsKHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
+const VkExternalSemaphoreHandleTypeFlagsKHR AllVkExternalSemaphoreHandleTypeFlagBitsKHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR|VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA;
const VkSemaphoreImportFlagsKHR AllVkSemaphoreImportFlagBitsKHR = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT|VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR;
const VkExternalFenceFeatureFlagsKHR AllVkExternalFenceFeatureFlagBitsKHR = VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT|VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT|VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR|VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR;
const VkExternalFenceHandleTypeFlagsKHR AllVkExternalFenceHandleTypeFlagBitsKHR = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR|VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR;
@@ -439,18 +439,6 @@
typedef bool (*PFN_manual_vkBindImageMemory2KHR)(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos);
typedef bool (*PFN_manual_vkGetDescriptorSetLayoutSupportKHR)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport);
#ifdef VK_USE_PLATFORM_FUCHSIA
-typedef bool (*PFN_manual_vkGetMemoryFuchsiaHandleKHR)(VkDevice device, const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-typedef bool (*PFN_manual_vkGetMemoryFuchsiaHandlePropertiesKHR)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-typedef bool (*PFN_manual_vkImportSemaphoreFuchsiaHandleKHR)(VkDevice device, const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-typedef bool (*PFN_manual_vkGetSemaphoreFuchsiaHandleKHR)(VkDevice device, const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
typedef bool (*PFN_manual_vkCreateMagmaSurfaceKHR)(VkInstance instance, const VkMagmaSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
@@ -817,18 +805,6 @@
{"vkBindImageMemory2KHR", nullptr},
{"vkGetDescriptorSetLayoutSupportKHR", nullptr},
#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandleKHR", nullptr},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandlePropertiesKHR", nullptr},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkImportSemaphoreFuchsiaHandleKHR", nullptr},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetSemaphoreFuchsiaHandleKHR", nullptr},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", nullptr},
#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
@@ -1503,9 +1479,9 @@
if (pAllocateInfo != NULL)
{
- const VkStructureType allowed_structs_VkMemoryAllocateInfo[] = { VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV, VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR, VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV, VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA, VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR, VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR, VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV, VK_STRUCTURE_TYPE_TEMP_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA, VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO, VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO };
+ const VkStructureType allowed_structs_VkMemoryAllocateInfo[] = { VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO, VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_NV, VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_KHR, VK_STRUCTURE_TYPE_EXPORT_MEMORY_WIN32_HANDLE_INFO_NV, VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA, VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR, VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR, VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV, VK_STRUCTURE_TYPE_TEMP_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA, VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO, VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO };
- skip |= validate_struct_pnext(local_data->report_data, "vkAllocateMemory", "pAllocateInfo->pNext", "VkDedicatedAllocationMemoryAllocateInfoNV, VkExportMemoryAllocateInfo, VkExportMemoryAllocateInfoNV, VkExportMemoryWin32HandleInfoKHR, VkExportMemoryWin32HandleInfoNV, VkImportAndroidHardwareBufferInfoANDROID, VkImportMemoryBufferCollectionFUCHSIA, VkImportMemoryFdInfoKHR, VkImportMemoryFuchsiaHandleInfoKHR, VkImportMemoryHostPointerInfoEXT, VkImportMemoryWin32HandleInfoKHR, VkImportMemoryWin32HandleInfoNV, VkImportMemoryZirconHandleInfoFUCHSIA, VkMemoryAllocateFlagsInfo, VkMemoryDedicatedAllocateInfo", pAllocateInfo->pNext, ARRAY_SIZE(allowed_structs_VkMemoryAllocateInfo), allowed_structs_VkMemoryAllocateInfo, GeneratedHeaderVersion, VALIDATION_ERROR_0c61c40d);
+ skip |= validate_struct_pnext(local_data->report_data, "vkAllocateMemory", "pAllocateInfo->pNext", "VkDedicatedAllocationMemoryAllocateInfoNV, VkExportMemoryAllocateInfo, VkExportMemoryAllocateInfoNV, VkExportMemoryWin32HandleInfoKHR, VkExportMemoryWin32HandleInfoNV, VkImportAndroidHardwareBufferInfoANDROID, VkImportMemoryBufferCollectionFUCHSIA, VkImportMemoryFdInfoKHR, VkImportMemoryHostPointerInfoEXT, VkImportMemoryWin32HandleInfoKHR, VkImportMemoryWin32HandleInfoNV, VkImportMemoryZirconHandleInfoFUCHSIA, VkMemoryAllocateFlagsInfo, VkMemoryDedicatedAllocateInfo", pAllocateInfo->pNext, ARRAY_SIZE(allowed_structs_VkMemoryAllocateInfo), allowed_structs_VkMemoryAllocateInfo, GeneratedHeaderVersion, VALIDATION_ERROR_0c61c40d);
}
if (pAllocator != NULL)
@@ -9361,169 +9337,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- layer_data *local_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- bool skip = false;
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- std::unique_lock<std::mutex> lock(global_lock);
-
- if (!local_data->extensions.vk_khr_external_memory) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandleKHR", VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_memory_capabilities) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandleKHR", VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_memory_fuchsia) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandleKHR", VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME);
-
- skip |= validate_struct_type(local_data->report_data, "vkGetMemoryFuchsiaHandleKHR", "pGetFuchsiaHandleInfo", "VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR", pGetFuchsiaHandleInfo, VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR, true, VALIDATION_ERROR_UNDEFINED);
-
- if (pGetFuchsiaHandleInfo != NULL)
- {
- skip |= validate_struct_pnext(local_data->report_data, "vkGetMemoryFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->pNext", NULL, pGetFuchsiaHandleInfo->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_UNDEFINED);
-
- skip |= validate_required_handle(local_data->report_data, "vkGetMemoryFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->memory", pGetFuchsiaHandleInfo->memory);
-
- skip |= validate_flags(local_data->report_data, "vkGetMemoryFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->handleType", "VkExternalMemoryHandleTypeFlagBits", AllVkExternalMemoryHandleTypeFlagBits, pGetFuchsiaHandleInfo->handleType, true, true, VALIDATION_ERROR_UNDEFINED);
- }
-
- skip |= validate_required_pointer(local_data->report_data, "vkGetMemoryFuchsiaHandleKHR", "pFuchsiaHandle", pFuchsiaHandle, VALIDATION_ERROR_UNDEFINED);
-
- PFN_manual_vkGetMemoryFuchsiaHandleKHR custom_func = (PFN_manual_vkGetMemoryFuchsiaHandleKHR)custom_functions["vkGetMemoryFuchsiaHandleKHR"];
- if (custom_func != nullptr) {
- skip |= custom_func(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
-
- lock.unlock();
- if (!skip) {
- result = local_data->dispatch_table.GetMemoryFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties)
-{
- layer_data *local_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- bool skip = false;
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- std::unique_lock<std::mutex> lock(global_lock);
-
- if (!local_data->extensions.vk_khr_external_memory) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandlePropertiesKHR", VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_memory_capabilities) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandlePropertiesKHR", VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_memory_fuchsia) skip |= OutputExtensionError(local_data, "vkGetMemoryFuchsiaHandlePropertiesKHR", VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME);
-
- skip |= validate_flags(local_data->report_data, "vkGetMemoryFuchsiaHandlePropertiesKHR", "handleType", "VkExternalMemoryHandleTypeFlagBits", AllVkExternalMemoryHandleTypeFlagBits, handleType, true, true, VALIDATION_ERROR_UNDEFINED);
-
- skip |= validate_struct_type(local_data->report_data, "vkGetMemoryFuchsiaHandlePropertiesKHR", "pMemoryFuchsiaHandleProperties", "VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR", pMemoryFuchsiaHandleProperties, VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR, true, VALIDATION_ERROR_UNDEFINED);
-
- PFN_manual_vkGetMemoryFuchsiaHandlePropertiesKHR custom_func = (PFN_manual_vkGetMemoryFuchsiaHandlePropertiesKHR)custom_functions["vkGetMemoryFuchsiaHandlePropertiesKHR"];
- if (custom_func != nullptr) {
- skip |= custom_func(device, handleType, fuchsiaHandle, pMemoryFuchsiaHandleProperties);
- }
-
- lock.unlock();
- if (!skip) {
- result = local_data->dispatch_table.GetMemoryFuchsiaHandlePropertiesKHR(device, handleType, fuchsiaHandle, pMemoryFuchsiaHandleProperties);
- }
- return result;
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo)
-{
- layer_data *local_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- bool skip = false;
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- std::unique_lock<std::mutex> lock(global_lock);
-
- if (!local_data->extensions.vk_khr_external_semaphore) skip |= OutputExtensionError(local_data, "vkImportSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_semaphore_capabilities) skip |= OutputExtensionError(local_data, "vkImportSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_semaphore_fuchsia) skip |= OutputExtensionError(local_data, "vkImportSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME);
-
- skip |= validate_struct_type(local_data->report_data, "vkImportSemaphoreFuchsiaHandleKHR", "pImportSemaphoreFuchsiaHandleInfo", "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR", pImportSemaphoreFuchsiaHandleInfo, VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR, true, VALIDATION_ERROR_UNDEFINED);
-
- if (pImportSemaphoreFuchsiaHandleInfo != NULL)
- {
- skip |= validate_struct_pnext(local_data->report_data, "vkImportSemaphoreFuchsiaHandleKHR", "pImportSemaphoreFuchsiaHandleInfo->pNext", NULL, pImportSemaphoreFuchsiaHandleInfo->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_UNDEFINED);
-
- skip |= validate_required_handle(local_data->report_data, "vkImportSemaphoreFuchsiaHandleKHR", "pImportSemaphoreFuchsiaHandleInfo->semaphore", pImportSemaphoreFuchsiaHandleInfo->semaphore);
-
- skip |= validate_flags(local_data->report_data, "vkImportSemaphoreFuchsiaHandleKHR", "pImportSemaphoreFuchsiaHandleInfo->flags", "VkSemaphoreImportFlagBits", AllVkSemaphoreImportFlagBits, pImportSemaphoreFuchsiaHandleInfo->flags, false, false, VALIDATION_ERROR_UNDEFINED);
-
- skip |= validate_flags(local_data->report_data, "vkImportSemaphoreFuchsiaHandleKHR", "pImportSemaphoreFuchsiaHandleInfo->handleType", "VkExternalSemaphoreHandleTypeFlagBits", AllVkExternalSemaphoreHandleTypeFlagBits, pImportSemaphoreFuchsiaHandleInfo->handleType, true, true, VALIDATION_ERROR_UNDEFINED);
- }
-
- PFN_manual_vkImportSemaphoreFuchsiaHandleKHR custom_func = (PFN_manual_vkImportSemaphoreFuchsiaHandleKHR)custom_functions["vkImportSemaphoreFuchsiaHandleKHR"];
- if (custom_func != nullptr) {
- skip |= custom_func(device, pImportSemaphoreFuchsiaHandleInfo);
- }
-
- lock.unlock();
- if (!skip) {
- result = local_data->dispatch_table.ImportSemaphoreFuchsiaHandleKHR(device, pImportSemaphoreFuchsiaHandleInfo);
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- layer_data *local_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- bool skip = false;
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- std::unique_lock<std::mutex> lock(global_lock);
-
- if (!local_data->extensions.vk_khr_external_semaphore) skip |= OutputExtensionError(local_data, "vkGetSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_semaphore_capabilities) skip |= OutputExtensionError(local_data, "vkGetSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME);
-
- if (!local_data->extensions.vk_khr_external_semaphore_fuchsia) skip |= OutputExtensionError(local_data, "vkGetSemaphoreFuchsiaHandleKHR", VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME);
-
- skip |= validate_struct_type(local_data->report_data, "vkGetSemaphoreFuchsiaHandleKHR", "pGetFuchsiaHandleInfo", "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR", pGetFuchsiaHandleInfo, VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR, true, VALIDATION_ERROR_UNDEFINED);
-
- if (pGetFuchsiaHandleInfo != NULL)
- {
- skip |= validate_struct_pnext(local_data->report_data, "vkGetSemaphoreFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->pNext", NULL, pGetFuchsiaHandleInfo->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_UNDEFINED);
-
- skip |= validate_required_handle(local_data->report_data, "vkGetSemaphoreFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->semaphore", pGetFuchsiaHandleInfo->semaphore);
-
- skip |= validate_flags(local_data->report_data, "vkGetSemaphoreFuchsiaHandleKHR", "pGetFuchsiaHandleInfo->handleType", "VkExternalSemaphoreHandleTypeFlagBits", AllVkExternalSemaphoreHandleTypeFlagBits, pGetFuchsiaHandleInfo->handleType, true, true, VALIDATION_ERROR_UNDEFINED);
- }
-
- skip |= validate_required_pointer(local_data->report_data, "vkGetSemaphoreFuchsiaHandleKHR", "pFuchsiaHandle", pFuchsiaHandle, VALIDATION_ERROR_UNDEFINED);
-
- PFN_manual_vkGetSemaphoreFuchsiaHandleKHR custom_func = (PFN_manual_vkGetSemaphoreFuchsiaHandleKHR)custom_functions["vkGetSemaphoreFuchsiaHandleKHR"];
- if (custom_func != nullptr) {
- skip |= custom_func(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
-
- lock.unlock();
- if (!skip) {
- result = local_data->dispatch_table.GetSemaphoreFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
- return result;
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
VKAPI_ATTR VkResult VKAPI_CALL vkCreateMagmaSurfaceKHR(
VkInstance instance,
const VkMagmaSurfaceCreateInfoKHR* pCreateInfo,
@@ -13311,30 +13124,6 @@
const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
VkDescriptorSetLayoutSupport* pSupport);
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL ImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle);
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
VKAPI_ATTR VkResult VKAPI_CALL CreateMagmaSurfaceKHR(
VkInstance instance,
const VkMagmaSurfaceCreateInfoKHR* pCreateInfo,
@@ -13952,18 +13741,6 @@
{"vkBindImageMemory2KHR", (void*)vkBindImageMemory2KHR},
{"vkGetDescriptorSetLayoutSupportKHR", (void*)vkGetDescriptorSetLayoutSupportKHR},
#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandleKHR", (void*)vkGetMemoryFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandlePropertiesKHR", (void*)vkGetMemoryFuchsiaHandlePropertiesKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkImportSemaphoreFuchsiaHandleKHR", (void*)vkImportSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetSemaphoreFuchsiaHandleKHR", (void*)vkGetSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", (void*)vkCreateMagmaSurfaceKHR},
#endif
#ifdef VK_USE_PLATFORM_FUCHSIA
diff --git a/build-fuchsia/generated/include/thread_check.h b/build-fuchsia/generated/include/thread_check.h
index 00bc780..43bf7ae 100644
--- a/build-fuchsia/generated/include/thread_check.h
+++ b/build-fuchsia/generated/include/thread_check.h
@@ -4830,100 +4830,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- dispatch_key key = get_dispatch_key(device);
- layer_data *my_data = GetLayerDataPtr(key, layer_data_map);
- VkLayerDispatchTable *pTable = my_data->device_dispatch_table;
- VkResult result;
- bool threadChecks = startMultiThread();
- if (threadChecks) {
- startReadObject(my_data, device);
- }
- result = pTable->GetMemoryFuchsiaHandleKHR(device,pGetFuchsiaHandleInfo,pFuchsiaHandle);
- if (threadChecks) {
- finishReadObject(my_data, device);
- } else {
- finishMultiThread();
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties)
-{
- dispatch_key key = get_dispatch_key(device);
- layer_data *my_data = GetLayerDataPtr(key, layer_data_map);
- VkLayerDispatchTable *pTable = my_data->device_dispatch_table;
- VkResult result;
- bool threadChecks = startMultiThread();
- if (threadChecks) {
- startReadObject(my_data, device);
- }
- result = pTable->GetMemoryFuchsiaHandlePropertiesKHR(device,handleType,fuchsiaHandle,pMemoryFuchsiaHandleProperties);
- if (threadChecks) {
- finishReadObject(my_data, device);
- } else {
- finishMultiThread();
- }
- return result;
-}
-#endif /* VK_USE_PLATFORM_FUCHSIA */
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo)
-{
- dispatch_key key = get_dispatch_key(device);
- layer_data *my_data = GetLayerDataPtr(key, layer_data_map);
- VkLayerDispatchTable *pTable = my_data->device_dispatch_table;
- VkResult result;
- bool threadChecks = startMultiThread();
- if (threadChecks) {
- startReadObject(my_data, device);
- }
- result = pTable->ImportSemaphoreFuchsiaHandleKHR(device,pImportSemaphoreFuchsiaHandleInfo);
- if (threadChecks) {
- finishReadObject(my_data, device);
- } else {
- finishMultiThread();
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- dispatch_key key = get_dispatch_key(device);
- layer_data *my_data = GetLayerDataPtr(key, layer_data_map);
- VkLayerDispatchTable *pTable = my_data->device_dispatch_table;
- VkResult result;
- bool threadChecks = startMultiThread();
- if (threadChecks) {
- startReadObject(my_data, device);
- }
- result = pTable->GetSemaphoreFuchsiaHandleKHR(device,pGetFuchsiaHandleInfo,pFuchsiaHandle);
- if (threadChecks) {
- finishReadObject(my_data, device);
- } else {
- finishMultiThread();
- }
- return result;
-}
-#endif /* VK_USE_PLATFORM_FUCHSIA */
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
VKAPI_ATTR VkResult VKAPI_CALL CreateMagmaSurfaceKHR(
VkInstance instance,
const VkMagmaSurfaceCreateInfoKHR* pCreateInfo,
@@ -6546,18 +6452,6 @@
{"vkBindImageMemory2KHR", (void*)BindImageMemory2KHR},
{"vkGetDescriptorSetLayoutSupportKHR", (void*)GetDescriptorSetLayoutSupportKHR},
#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandleKHR", (void*)GetMemoryFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandlePropertiesKHR", (void*)GetMemoryFuchsiaHandlePropertiesKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkImportSemaphoreFuchsiaHandleKHR", (void*)ImportSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetSemaphoreFuchsiaHandleKHR", (void*)GetSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", (void*)CreateMagmaSurfaceKHR},
#endif
{"vkCreateDebugReportCallbackEXT", (void*)CreateDebugReportCallbackEXT},
diff --git a/build-fuchsia/generated/include/unique_objects_wrappers.h b/build-fuchsia/generated/include/unique_objects_wrappers.h
index 14bb3cf..6552362 100644
--- a/build-fuchsia/generated/include/unique_objects_wrappers.h
+++ b/build-fuchsia/generated/include/unique_objects_wrappers.h
@@ -154,14 +154,6 @@
cur_ext_struct = reinterpret_cast<void *>(safe_struct);
} break;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR: {
- safe_VkImportMemoryFuchsiaHandleInfoKHR *safe_struct = new safe_VkImportMemoryFuchsiaHandleInfoKHR;
- safe_struct->initialize(reinterpret_cast<const VkImportMemoryFuchsiaHandleInfoKHR *>(cur_pnext));
- cur_ext_struct = reinterpret_cast<void *>(safe_struct);
- } break;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT: {
safe_VkImportMemoryHostPointerInfoEXT *safe_struct = new safe_VkImportMemoryHostPointerInfoEXT;
safe_struct->initialize(reinterpret_cast<const VkImportMemoryHostPointerInfoEXT *>(cur_pnext));
@@ -414,12 +406,6 @@
delete reinterpret_cast<safe_VkImportMemoryFdInfoKHR *>(header);
break;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR:
- delete reinterpret_cast<safe_VkImportMemoryFuchsiaHandleInfoKHR *>(header);
- break;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT:
delete reinterpret_cast<safe_VkImportMemoryHostPointerInfoEXT *>(header);
break;
@@ -3688,83 +3674,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- safe_VkMemoryGetFuchsiaHandleInfoKHR *local_pGetFuchsiaHandleInfo = NULL;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- if (pGetFuchsiaHandleInfo) {
- local_pGetFuchsiaHandleInfo = new safe_VkMemoryGetFuchsiaHandleInfoKHR(pGetFuchsiaHandleInfo);
- if (pGetFuchsiaHandleInfo->memory) {
- local_pGetFuchsiaHandleInfo->memory = Unwrap(pGetFuchsiaHandleInfo->memory);
- }
- }
- }
- VkResult result = dev_data->dispatch_table.GetMemoryFuchsiaHandleKHR(device, (const VkMemoryGetFuchsiaHandleInfoKHR*)local_pGetFuchsiaHandleInfo, pFuchsiaHandle);
- if (local_pGetFuchsiaHandleInfo) {
- delete local_pGetFuchsiaHandleInfo;
- }
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo)
-{
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- safe_VkImportSemaphoreFuchsiaHandleInfoKHR *local_pImportSemaphoreFuchsiaHandleInfo = NULL;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- if (pImportSemaphoreFuchsiaHandleInfo) {
- local_pImportSemaphoreFuchsiaHandleInfo = new safe_VkImportSemaphoreFuchsiaHandleInfoKHR(pImportSemaphoreFuchsiaHandleInfo);
- if (pImportSemaphoreFuchsiaHandleInfo->semaphore) {
- local_pImportSemaphoreFuchsiaHandleInfo->semaphore = Unwrap(pImportSemaphoreFuchsiaHandleInfo->semaphore);
- }
- }
- }
- VkResult result = dev_data->dispatch_table.ImportSemaphoreFuchsiaHandleKHR(device, (const VkImportSemaphoreFuchsiaHandleInfoKHR*)local_pImportSemaphoreFuchsiaHandleInfo);
- if (local_pImportSemaphoreFuchsiaHandleInfo) {
- delete local_pImportSemaphoreFuchsiaHandleInfo;
- }
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle)
-{
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- safe_VkSemaphoreGetFuchsiaHandleInfoKHR *local_pGetFuchsiaHandleInfo = NULL;
- {
- std::lock_guard<std::mutex> lock(global_lock);
- if (pGetFuchsiaHandleInfo) {
- local_pGetFuchsiaHandleInfo = new safe_VkSemaphoreGetFuchsiaHandleInfoKHR(pGetFuchsiaHandleInfo);
- if (pGetFuchsiaHandleInfo->semaphore) {
- local_pGetFuchsiaHandleInfo->semaphore = Unwrap(pGetFuchsiaHandleInfo->semaphore);
- }
- }
- }
- VkResult result = dev_data->dispatch_table.GetSemaphoreFuchsiaHandleKHR(device, (const VkSemaphoreGetFuchsiaHandleInfoKHR*)local_pGetFuchsiaHandleInfo, pFuchsiaHandle);
- if (local_pGetFuchsiaHandleInfo) {
- delete local_pGetFuchsiaHandleInfo;
- }
- return result;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
VKAPI_ATTR VkResult VKAPI_CALL CreateMagmaSurfaceKHR(
VkInstance instance,
const VkMagmaSurfaceCreateInfoKHR* pCreateInfo,
@@ -4744,15 +4653,6 @@
{"vkBindImageMemory2KHR", (void*)BindImageMemory2KHR},
{"vkGetDescriptorSetLayoutSupportKHR", (void*)GetDescriptorSetLayoutSupportKHR},
#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetMemoryFuchsiaHandleKHR", (void*)GetMemoryFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkImportSemaphoreFuchsiaHandleKHR", (void*)ImportSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
- {"vkGetSemaphoreFuchsiaHandleKHR", (void*)GetSemaphoreFuchsiaHandleKHR},
-#endif
-#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", (void*)CreateMagmaSurfaceKHR},
#endif
{"vkDebugMarkerSetObjectTagEXT", (void *)DebugMarkerSetObjectTagEXT},
diff --git a/build-fuchsia/generated/include/vk_dispatch_table_helper.h b/build-fuchsia/generated/include/vk_dispatch_table_helper.h
index b1dc859..faa780a 100644
--- a/build-fuchsia/generated/include/vk_dispatch_table_helper.h
+++ b/build-fuchsia/generated/include/vk_dispatch_table_helper.h
@@ -79,18 +79,6 @@
static VKAPI_ATTR VkResult VKAPI_CALL StubBindBufferMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) { return VK_SUCCESS; };
static VKAPI_ATTR VkResult VKAPI_CALL StubBindImageMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) { return VK_SUCCESS; };
static VKAPI_ATTR void VKAPI_CALL StubGetDescriptorSetLayoutSupportKHR(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayoutSupport* pSupport) { };
-#ifdef VK_USE_PLATFORM_FUCHSIA
-static VKAPI_ATTR VkResult VKAPI_CALL StubGetMemoryFuchsiaHandleKHR(VkDevice device, const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle) { return VK_SUCCESS; };
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-static VKAPI_ATTR VkResult VKAPI_CALL StubGetMemoryFuchsiaHandlePropertiesKHR(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties) { return VK_SUCCESS; };
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-static VKAPI_ATTR VkResult VKAPI_CALL StubImportSemaphoreFuchsiaHandleKHR(VkDevice device, const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo) { return VK_SUCCESS; };
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-static VKAPI_ATTR VkResult VKAPI_CALL StubGetSemaphoreFuchsiaHandleKHR(VkDevice device, const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle) { return VK_SUCCESS; };
-#endif // VK_USE_PLATFORM_FUCHSIA
static VKAPI_ATTR VkResult VKAPI_CALL StubDebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarkerObjectTagInfoEXT* pTagInfo) { return VK_SUCCESS; };
static VKAPI_ATTR VkResult VKAPI_CALL StubDebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT* pNameInfo) { return VK_SUCCESS; };
static VKAPI_ATTR void VKAPI_CALL StubCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) { };
@@ -389,22 +377,6 @@
if (table->BindImageMemory2KHR == nullptr) { table->BindImageMemory2KHR = (PFN_vkBindImageMemory2KHR)StubBindImageMemory2KHR; }
table->GetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR) gpa(device, "vkGetDescriptorSetLayoutSupportKHR");
if (table->GetDescriptorSetLayoutSupportKHR == nullptr) { table->GetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR)StubGetDescriptorSetLayoutSupportKHR; }
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetMemoryFuchsiaHandleKHR = (PFN_vkGetMemoryFuchsiaHandleKHR) gpa(device, "vkGetMemoryFuchsiaHandleKHR");
- if (table->GetMemoryFuchsiaHandleKHR == nullptr) { table->GetMemoryFuchsiaHandleKHR = (PFN_vkGetMemoryFuchsiaHandleKHR)StubGetMemoryFuchsiaHandleKHR; }
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetMemoryFuchsiaHandlePropertiesKHR = (PFN_vkGetMemoryFuchsiaHandlePropertiesKHR) gpa(device, "vkGetMemoryFuchsiaHandlePropertiesKHR");
- if (table->GetMemoryFuchsiaHandlePropertiesKHR == nullptr) { table->GetMemoryFuchsiaHandlePropertiesKHR = (PFN_vkGetMemoryFuchsiaHandlePropertiesKHR)StubGetMemoryFuchsiaHandlePropertiesKHR; }
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->ImportSemaphoreFuchsiaHandleKHR = (PFN_vkImportSemaphoreFuchsiaHandleKHR) gpa(device, "vkImportSemaphoreFuchsiaHandleKHR");
- if (table->ImportSemaphoreFuchsiaHandleKHR == nullptr) { table->ImportSemaphoreFuchsiaHandleKHR = (PFN_vkImportSemaphoreFuchsiaHandleKHR)StubImportSemaphoreFuchsiaHandleKHR; }
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetSemaphoreFuchsiaHandleKHR = (PFN_vkGetSemaphoreFuchsiaHandleKHR) gpa(device, "vkGetSemaphoreFuchsiaHandleKHR");
- if (table->GetSemaphoreFuchsiaHandleKHR == nullptr) { table->GetSemaphoreFuchsiaHandleKHR = (PFN_vkGetSemaphoreFuchsiaHandleKHR)StubGetSemaphoreFuchsiaHandleKHR; }
-#endif // VK_USE_PLATFORM_FUCHSIA
table->DebugMarkerSetObjectTagEXT = (PFN_vkDebugMarkerSetObjectTagEXT) gpa(device, "vkDebugMarkerSetObjectTagEXT");
if (table->DebugMarkerSetObjectTagEXT == nullptr) { table->DebugMarkerSetObjectTagEXT = (PFN_vkDebugMarkerSetObjectTagEXT)StubDebugMarkerSetObjectTagEXT; }
table->DebugMarkerSetObjectNameEXT = (PFN_vkDebugMarkerSetObjectNameEXT) gpa(device, "vkDebugMarkerSetObjectNameEXT");
diff --git a/build-fuchsia/generated/include/vk_enum_string_helper.h b/build-fuchsia/generated/include/vk_enum_string_helper.h
index 3cc7e30..767305f 100644
--- a/build-fuchsia/generated/include/vk_enum_string_helper.h
+++ b/build-fuchsia/generated/include/vk_enum_string_helper.h
@@ -340,8 +340,6 @@
return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_BUFFER_COLLECTION_FUCHSIA";
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR:
return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR";
- case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR:
- return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT:
return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT";
case VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_KHR:
@@ -350,8 +348,6 @@
return "VK_STRUCTURE_TYPE_IMPORT_MEMORY_WIN32_HANDLE_INFO_NV";
case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR:
return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR";
- case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR:
- return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR:
return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_WIN32_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX:
@@ -382,14 +378,10 @@
return "VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS";
case VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR:
return "VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR";
- case VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR:
- return "VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR";
case VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID:
return "VK_STRUCTURE_TYPE_MEMORY_GET_ANDROID_HARDWARE_BUFFER_INFO_ANDROID";
case VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR:
return "VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR";
- case VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR:
- return "VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR:
return "VK_STRUCTURE_TYPE_MEMORY_GET_WIN32_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT:
@@ -560,8 +552,6 @@
return "VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO";
case VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR:
return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR";
- case VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR:
- return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR:
return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_WIN32_HANDLE_INFO_KHR";
case VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO:
@@ -2718,8 +2708,6 @@
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT";
- case VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR:
- return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT:
@@ -2810,8 +2798,6 @@
{
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT:
return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT";
- case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR:
- return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR";
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT:
return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT";
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT:
@@ -3035,8 +3021,6 @@
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT";
- case VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR:
- return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT:
return "VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT";
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT:
@@ -3075,8 +3059,6 @@
{
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT:
return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT";
- case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR:
- return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR";
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT:
return "VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT";
case VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT:
diff --git a/build-fuchsia/generated/include/vk_extension_helper.h b/build-fuchsia/generated/include/vk_extension_helper.h
index ecd4b1a..b943d11 100644
--- a/build-fuchsia/generated/include/vk_extension_helper.h
+++ b/build-fuchsia/generated/include/vk_extension_helper.h
@@ -307,11 +307,9 @@
bool vk_khr_external_fence_win32{false};
bool vk_khr_external_memory{false};
bool vk_khr_external_memory_fd{false};
- bool vk_khr_external_memory_fuchsia{false};
bool vk_khr_external_memory_win32{false};
bool vk_khr_external_semaphore{false};
bool vk_khr_external_semaphore_fd{false};
- bool vk_khr_external_semaphore_fuchsia{false};
bool vk_khr_external_semaphore_win32{false};
bool vk_khr_get_memory_requirements_2{false};
bool vk_khr_image_format_list{false};
@@ -461,11 +459,6 @@
{&DeviceExtensions::vk_khr_external_memory_capabilities, VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME}}})),
std::make_pair(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_memory_fd, {{
{&DeviceExtensions::vk_khr_external_memory, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME}}})),
-#ifdef VK_USE_PLATFORM_FUCHSIA
- std::make_pair(VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_memory_fuchsia, {{
- {&DeviceExtensions::vk_khr_external_memory_capabilities, VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME},
- {&DeviceExtensions::vk_khr_external_memory, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME}}})),
-#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
std::make_pair(VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_memory_win32, {{
{&DeviceExtensions::vk_khr_external_memory, VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME}}})),
@@ -474,11 +467,6 @@
{&DeviceExtensions::vk_khr_external_semaphore_capabilities, VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME}}})),
std::make_pair(VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_semaphore_fd, {{
{&DeviceExtensions::vk_khr_external_semaphore, VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME}}})),
-#ifdef VK_USE_PLATFORM_FUCHSIA
- std::make_pair(VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_semaphore_fuchsia, {{
- {&DeviceExtensions::vk_khr_external_semaphore_capabilities, VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME},
- {&DeviceExtensions::vk_khr_external_semaphore, VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME}}})),
-#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
std::make_pair(VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, DeviceInfo(&DeviceExtensions::vk_khr_external_semaphore_win32, {{
{&DeviceExtensions::vk_khr_external_semaphore, VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME}}})),
@@ -667,17 +655,11 @@
#endif
VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME
VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME
-#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME
#endif
VK_KHR_EXTERNAL_SEMAPHORE_EXTENSION_NAME
VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME
-#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME
#endif
diff --git a/build-fuchsia/generated/include/vk_layer_dispatch_table.h b/build-fuchsia/generated/include/vk_layer_dispatch_table.h
index cfab63b..1c816dd 100644
--- a/build-fuchsia/generated/include/vk_layer_dispatch_table.h
+++ b/build-fuchsia/generated/include/vk_layer_dispatch_table.h
@@ -443,22 +443,6 @@
// ---- VK_KHR_maintenance3 extension commands
PFN_vkGetDescriptorSetLayoutSupportKHR GetDescriptorSetLayoutSupportKHR;
- // ---- VK_KHR_external_memory_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetMemoryFuchsiaHandleKHR GetMemoryFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetMemoryFuchsiaHandlePropertiesKHR GetMemoryFuchsiaHandlePropertiesKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
- // ---- VK_KHR_external_semaphore_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkImportSemaphoreFuchsiaHandleKHR ImportSemaphoreFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetSemaphoreFuchsiaHandleKHR GetSemaphoreFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
// ---- VK_EXT_debug_marker extension commands
PFN_vkDebugMarkerSetObjectTagEXT DebugMarkerSetObjectTagEXT;
PFN_vkDebugMarkerSetObjectNameEXT DebugMarkerSetObjectNameEXT;
diff --git a/build-fuchsia/generated/include/vk_loader_extensions.c b/build-fuchsia/generated/include/vk_loader_extensions.c
index 52b85c4..8c184d9 100644
--- a/build-fuchsia/generated/include/vk_loader_extensions.c
+++ b/build-fuchsia/generated/include/vk_loader_extensions.c
@@ -492,22 +492,6 @@
// ---- VK_KHR_maintenance3 extension commands
table->GetDescriptorSetLayoutSupportKHR = (PFN_vkGetDescriptorSetLayoutSupportKHR)gpa(dev, "vkGetDescriptorSetLayoutSupportKHR");
- // ---- VK_KHR_external_memory_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetMemoryFuchsiaHandleKHR = (PFN_vkGetMemoryFuchsiaHandleKHR)gpa(dev, "vkGetMemoryFuchsiaHandleKHR");
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetMemoryFuchsiaHandlePropertiesKHR = (PFN_vkGetMemoryFuchsiaHandlePropertiesKHR)gpa(dev, "vkGetMemoryFuchsiaHandlePropertiesKHR");
-#endif // VK_USE_PLATFORM_FUCHSIA
-
- // ---- VK_KHR_external_semaphore_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->ImportSemaphoreFuchsiaHandleKHR = (PFN_vkImportSemaphoreFuchsiaHandleKHR)gpa(dev, "vkImportSemaphoreFuchsiaHandleKHR");
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- table->GetSemaphoreFuchsiaHandleKHR = (PFN_vkGetSemaphoreFuchsiaHandleKHR)gpa(dev, "vkGetSemaphoreFuchsiaHandleKHR");
-#endif // VK_USE_PLATFORM_FUCHSIA
-
// ---- VK_EXT_debug_marker extension commands
table->DebugMarkerSetObjectTagEXT = (PFN_vkDebugMarkerSetObjectTagEXT)gpa(dev, "vkDebugMarkerSetObjectTagEXT");
table->DebugMarkerSetObjectNameEXT = (PFN_vkDebugMarkerSetObjectNameEXT)gpa(dev, "vkDebugMarkerSetObjectNameEXT");
@@ -1039,22 +1023,6 @@
// ---- VK_KHR_maintenance3 extension commands
if (!strcmp(name, "GetDescriptorSetLayoutSupportKHR")) return (void *)table->GetDescriptorSetLayoutSupportKHR;
- // ---- VK_KHR_external_memory_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp(name, "GetMemoryFuchsiaHandleKHR")) return (void *)table->GetMemoryFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp(name, "GetMemoryFuchsiaHandlePropertiesKHR")) return (void *)table->GetMemoryFuchsiaHandlePropertiesKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
- // ---- VK_KHR_external_semaphore_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp(name, "ImportSemaphoreFuchsiaHandleKHR")) return (void *)table->ImportSemaphoreFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp(name, "GetSemaphoreFuchsiaHandleKHR")) return (void *)table->GetSemaphoreFuchsiaHandleKHR;
-#endif // VK_USE_PLATFORM_FUCHSIA
-
// ---- VK_EXT_debug_marker extension commands
if (!strcmp(name, "DebugMarkerSetObjectTagEXT")) return (void *)table->DebugMarkerSetObjectTagEXT;
if (!strcmp(name, "DebugMarkerSetObjectNameEXT")) return (void *)table->DebugMarkerSetObjectNameEXT;
@@ -1670,52 +1638,6 @@
}
-// ---- VK_KHR_external_memory_fuchsia extension trampoline/terminators
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->GetMemoryFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->GetMemoryFuchsiaHandlePropertiesKHR(device, handleType, fuchsiaHandle, pMemoryFuchsiaHandleProperties);
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-// ---- VK_KHR_external_semaphore_fuchsia extension trampoline/terminators
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL ImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->ImportSemaphoreFuchsiaHandleKHR(device, pImportSemaphoreFuchsiaHandleInfo);
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->GetSemaphoreFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
-}
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-
// ---- VK_EXT_debug_marker extension trampoline/terminators
VKAPI_ATTR VkResult VKAPI_CALL DebugMarkerSetObjectTagEXT(
@@ -2701,34 +2623,6 @@
return true;
}
- // ---- VK_KHR_external_memory_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp("vkGetMemoryFuchsiaHandleKHR", name)) {
- *addr = (void *)GetMemoryFuchsiaHandleKHR;
- return true;
- }
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp("vkGetMemoryFuchsiaHandlePropertiesKHR", name)) {
- *addr = (void *)GetMemoryFuchsiaHandlePropertiesKHR;
- return true;
- }
-#endif // VK_USE_PLATFORM_FUCHSIA
-
- // ---- VK_KHR_external_semaphore_fuchsia extension commands
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp("vkImportSemaphoreFuchsiaHandleKHR", name)) {
- *addr = (void *)ImportSemaphoreFuchsiaHandleKHR;
- return true;
- }
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
- if (!strcmp("vkGetSemaphoreFuchsiaHandleKHR", name)) {
- *addr = (void *)GetSemaphoreFuchsiaHandleKHR;
- return true;
- }
-#endif // VK_USE_PLATFORM_FUCHSIA
-
// ---- VK_EXT_debug_marker extension commands
if (!strcmp("vkDebugMarkerSetObjectTagEXT", name)) {
*addr = (void *)DebugMarkerSetObjectTagEXT;
diff --git a/build-fuchsia/generated/include/vk_safe_struct.cpp b/build-fuchsia/generated/include/vk_safe_struct.cpp
index 53d8c38..df6f51b 100644
--- a/build-fuchsia/generated/include/vk_safe_struct.cpp
+++ b/build-fuchsia/generated/include/vk_safe_struct.cpp
@@ -12062,291 +12062,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
-safe_VkImportMemoryFuchsiaHandleInfoKHR::safe_VkImportMemoryFuchsiaHandleInfoKHR(const VkImportMemoryFuchsiaHandleInfoKHR* in_struct) :
- sType(in_struct->sType),
- pNext(in_struct->pNext),
- handleType(in_struct->handleType),
- handle(in_struct->handle)
-{
-}
-
-safe_VkImportMemoryFuchsiaHandleInfoKHR::safe_VkImportMemoryFuchsiaHandleInfoKHR()
-{}
-
-safe_VkImportMemoryFuchsiaHandleInfoKHR::safe_VkImportMemoryFuchsiaHandleInfoKHR(const safe_VkImportMemoryFuchsiaHandleInfoKHR& src)
-{
- sType = src.sType;
- pNext = src.pNext;
- handleType = src.handleType;
- handle = src.handle;
-}
-
-safe_VkImportMemoryFuchsiaHandleInfoKHR& safe_VkImportMemoryFuchsiaHandleInfoKHR::operator=(const safe_VkImportMemoryFuchsiaHandleInfoKHR& src)
-{
- if (&src == this) return *this;
-
-
- sType = src.sType;
- pNext = src.pNext;
- handleType = src.handleType;
- handle = src.handle;
-
- return *this;
-}
-
-safe_VkImportMemoryFuchsiaHandleInfoKHR::~safe_VkImportMemoryFuchsiaHandleInfoKHR()
-{
-}
-
-void safe_VkImportMemoryFuchsiaHandleInfoKHR::initialize(const VkImportMemoryFuchsiaHandleInfoKHR* in_struct)
-{
- sType = in_struct->sType;
- pNext = in_struct->pNext;
- handleType = in_struct->handleType;
- handle = in_struct->handle;
-}
-
-void safe_VkImportMemoryFuchsiaHandleInfoKHR::initialize(const safe_VkImportMemoryFuchsiaHandleInfoKHR* src)
-{
- sType = src->sType;
- pNext = src->pNext;
- handleType = src->handleType;
- handle = src->handle;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-
-safe_VkMemoryFuchsiaHandlePropertiesKHR::safe_VkMemoryFuchsiaHandlePropertiesKHR(const VkMemoryFuchsiaHandlePropertiesKHR* in_struct) :
- sType(in_struct->sType),
- pNext(in_struct->pNext),
- memoryTypeBits(in_struct->memoryTypeBits)
-{
-}
-
-safe_VkMemoryFuchsiaHandlePropertiesKHR::safe_VkMemoryFuchsiaHandlePropertiesKHR()
-{}
-
-safe_VkMemoryFuchsiaHandlePropertiesKHR::safe_VkMemoryFuchsiaHandlePropertiesKHR(const safe_VkMemoryFuchsiaHandlePropertiesKHR& src)
-{
- sType = src.sType;
- pNext = src.pNext;
- memoryTypeBits = src.memoryTypeBits;
-}
-
-safe_VkMemoryFuchsiaHandlePropertiesKHR& safe_VkMemoryFuchsiaHandlePropertiesKHR::operator=(const safe_VkMemoryFuchsiaHandlePropertiesKHR& src)
-{
- if (&src == this) return *this;
-
-
- sType = src.sType;
- pNext = src.pNext;
- memoryTypeBits = src.memoryTypeBits;
-
- return *this;
-}
-
-safe_VkMemoryFuchsiaHandlePropertiesKHR::~safe_VkMemoryFuchsiaHandlePropertiesKHR()
-{
-}
-
-void safe_VkMemoryFuchsiaHandlePropertiesKHR::initialize(const VkMemoryFuchsiaHandlePropertiesKHR* in_struct)
-{
- sType = in_struct->sType;
- pNext = in_struct->pNext;
- memoryTypeBits = in_struct->memoryTypeBits;
-}
-
-void safe_VkMemoryFuchsiaHandlePropertiesKHR::initialize(const safe_VkMemoryFuchsiaHandlePropertiesKHR* src)
-{
- sType = src->sType;
- pNext = src->pNext;
- memoryTypeBits = src->memoryTypeBits;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-
-safe_VkMemoryGetFuchsiaHandleInfoKHR::safe_VkMemoryGetFuchsiaHandleInfoKHR(const VkMemoryGetFuchsiaHandleInfoKHR* in_struct) :
- sType(in_struct->sType),
- pNext(in_struct->pNext),
- memory(in_struct->memory),
- handleType(in_struct->handleType)
-{
-}
-
-safe_VkMemoryGetFuchsiaHandleInfoKHR::safe_VkMemoryGetFuchsiaHandleInfoKHR()
-{}
-
-safe_VkMemoryGetFuchsiaHandleInfoKHR::safe_VkMemoryGetFuchsiaHandleInfoKHR(const safe_VkMemoryGetFuchsiaHandleInfoKHR& src)
-{
- sType = src.sType;
- pNext = src.pNext;
- memory = src.memory;
- handleType = src.handleType;
-}
-
-safe_VkMemoryGetFuchsiaHandleInfoKHR& safe_VkMemoryGetFuchsiaHandleInfoKHR::operator=(const safe_VkMemoryGetFuchsiaHandleInfoKHR& src)
-{
- if (&src == this) return *this;
-
-
- sType = src.sType;
- pNext = src.pNext;
- memory = src.memory;
- handleType = src.handleType;
-
- return *this;
-}
-
-safe_VkMemoryGetFuchsiaHandleInfoKHR::~safe_VkMemoryGetFuchsiaHandleInfoKHR()
-{
-}
-
-void safe_VkMemoryGetFuchsiaHandleInfoKHR::initialize(const VkMemoryGetFuchsiaHandleInfoKHR* in_struct)
-{
- sType = in_struct->sType;
- pNext = in_struct->pNext;
- memory = in_struct->memory;
- handleType = in_struct->handleType;
-}
-
-void safe_VkMemoryGetFuchsiaHandleInfoKHR::initialize(const safe_VkMemoryGetFuchsiaHandleInfoKHR* src)
-{
- sType = src->sType;
- pNext = src->pNext;
- memory = src->memory;
- handleType = src->handleType;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-
-safe_VkImportSemaphoreFuchsiaHandleInfoKHR::safe_VkImportSemaphoreFuchsiaHandleInfoKHR(const VkImportSemaphoreFuchsiaHandleInfoKHR* in_struct) :
- sType(in_struct->sType),
- pNext(in_struct->pNext),
- semaphore(in_struct->semaphore),
- flags(in_struct->flags),
- handleType(in_struct->handleType),
- handle(in_struct->handle)
-{
-}
-
-safe_VkImportSemaphoreFuchsiaHandleInfoKHR::safe_VkImportSemaphoreFuchsiaHandleInfoKHR()
-{}
-
-safe_VkImportSemaphoreFuchsiaHandleInfoKHR::safe_VkImportSemaphoreFuchsiaHandleInfoKHR(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR& src)
-{
- sType = src.sType;
- pNext = src.pNext;
- semaphore = src.semaphore;
- flags = src.flags;
- handleType = src.handleType;
- handle = src.handle;
-}
-
-safe_VkImportSemaphoreFuchsiaHandleInfoKHR& safe_VkImportSemaphoreFuchsiaHandleInfoKHR::operator=(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR& src)
-{
- if (&src == this) return *this;
-
-
- sType = src.sType;
- pNext = src.pNext;
- semaphore = src.semaphore;
- flags = src.flags;
- handleType = src.handleType;
- handle = src.handle;
-
- return *this;
-}
-
-safe_VkImportSemaphoreFuchsiaHandleInfoKHR::~safe_VkImportSemaphoreFuchsiaHandleInfoKHR()
-{
-}
-
-void safe_VkImportSemaphoreFuchsiaHandleInfoKHR::initialize(const VkImportSemaphoreFuchsiaHandleInfoKHR* in_struct)
-{
- sType = in_struct->sType;
- pNext = in_struct->pNext;
- semaphore = in_struct->semaphore;
- flags = in_struct->flags;
- handleType = in_struct->handleType;
- handle = in_struct->handle;
-}
-
-void safe_VkImportSemaphoreFuchsiaHandleInfoKHR::initialize(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR* src)
-{
- sType = src->sType;
- pNext = src->pNext;
- semaphore = src->semaphore;
- flags = src->flags;
- handleType = src->handleType;
- handle = src->handle;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-
-safe_VkSemaphoreGetFuchsiaHandleInfoKHR::safe_VkSemaphoreGetFuchsiaHandleInfoKHR(const VkSemaphoreGetFuchsiaHandleInfoKHR* in_struct) :
- sType(in_struct->sType),
- pNext(in_struct->pNext),
- semaphore(in_struct->semaphore),
- handleType(in_struct->handleType)
-{
-}
-
-safe_VkSemaphoreGetFuchsiaHandleInfoKHR::safe_VkSemaphoreGetFuchsiaHandleInfoKHR()
-{}
-
-safe_VkSemaphoreGetFuchsiaHandleInfoKHR::safe_VkSemaphoreGetFuchsiaHandleInfoKHR(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR& src)
-{
- sType = src.sType;
- pNext = src.pNext;
- semaphore = src.semaphore;
- handleType = src.handleType;
-}
-
-safe_VkSemaphoreGetFuchsiaHandleInfoKHR& safe_VkSemaphoreGetFuchsiaHandleInfoKHR::operator=(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR& src)
-{
- if (&src == this) return *this;
-
-
- sType = src.sType;
- pNext = src.pNext;
- semaphore = src.semaphore;
- handleType = src.handleType;
-
- return *this;
-}
-
-safe_VkSemaphoreGetFuchsiaHandleInfoKHR::~safe_VkSemaphoreGetFuchsiaHandleInfoKHR()
-{
-}
-
-void safe_VkSemaphoreGetFuchsiaHandleInfoKHR::initialize(const VkSemaphoreGetFuchsiaHandleInfoKHR* in_struct)
-{
- sType = in_struct->sType;
- pNext = in_struct->pNext;
- semaphore = in_struct->semaphore;
- handleType = in_struct->handleType;
-}
-
-void safe_VkSemaphoreGetFuchsiaHandleInfoKHR::initialize(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR* src)
-{
- sType = src->sType;
- pNext = src->pNext;
- semaphore = src->semaphore;
- handleType = src->handleType;
-}
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-
-
safe_VkMagmaSurfaceCreateInfoKHR::safe_VkMagmaSurfaceCreateInfoKHR(const VkMagmaSurfaceCreateInfoKHR* in_struct) :
sType(in_struct->sType),
pNext(in_struct->pNext),
diff --git a/build-fuchsia/generated/include/vk_safe_struct.h b/build-fuchsia/generated/include/vk_safe_struct.h
index 6816463..eef4432 100644
--- a/build-fuchsia/generated/include/vk_safe_struct.h
+++ b/build-fuchsia/generated/include/vk_safe_struct.h
@@ -2924,97 +2924,6 @@
};
#ifdef VK_USE_PLATFORM_FUCHSIA
-struct safe_VkImportMemoryFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkExternalMemoryHandleTypeFlagBits handleType;
- uint32_t handle;
- safe_VkImportMemoryFuchsiaHandleInfoKHR(const VkImportMemoryFuchsiaHandleInfoKHR* in_struct);
- safe_VkImportMemoryFuchsiaHandleInfoKHR(const safe_VkImportMemoryFuchsiaHandleInfoKHR& src);
- safe_VkImportMemoryFuchsiaHandleInfoKHR& operator=(const safe_VkImportMemoryFuchsiaHandleInfoKHR& src);
- safe_VkImportMemoryFuchsiaHandleInfoKHR();
- ~safe_VkImportMemoryFuchsiaHandleInfoKHR();
- void initialize(const VkImportMemoryFuchsiaHandleInfoKHR* in_struct);
- void initialize(const safe_VkImportMemoryFuchsiaHandleInfoKHR* src);
- VkImportMemoryFuchsiaHandleInfoKHR *ptr() { return reinterpret_cast<VkImportMemoryFuchsiaHandleInfoKHR *>(this); }
- VkImportMemoryFuchsiaHandleInfoKHR const *ptr() const { return reinterpret_cast<VkImportMemoryFuchsiaHandleInfoKHR const *>(this); }
-};
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-struct safe_VkMemoryFuchsiaHandlePropertiesKHR {
- VkStructureType sType;
- void* pNext;
- uint32_t memoryTypeBits;
- safe_VkMemoryFuchsiaHandlePropertiesKHR(const VkMemoryFuchsiaHandlePropertiesKHR* in_struct);
- safe_VkMemoryFuchsiaHandlePropertiesKHR(const safe_VkMemoryFuchsiaHandlePropertiesKHR& src);
- safe_VkMemoryFuchsiaHandlePropertiesKHR& operator=(const safe_VkMemoryFuchsiaHandlePropertiesKHR& src);
- safe_VkMemoryFuchsiaHandlePropertiesKHR();
- ~safe_VkMemoryFuchsiaHandlePropertiesKHR();
- void initialize(const VkMemoryFuchsiaHandlePropertiesKHR* in_struct);
- void initialize(const safe_VkMemoryFuchsiaHandlePropertiesKHR* src);
- VkMemoryFuchsiaHandlePropertiesKHR *ptr() { return reinterpret_cast<VkMemoryFuchsiaHandlePropertiesKHR *>(this); }
- VkMemoryFuchsiaHandlePropertiesKHR const *ptr() const { return reinterpret_cast<VkMemoryFuchsiaHandlePropertiesKHR const *>(this); }
-};
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-struct safe_VkMemoryGetFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkDeviceMemory memory;
- VkExternalMemoryHandleTypeFlagBits handleType;
- safe_VkMemoryGetFuchsiaHandleInfoKHR(const VkMemoryGetFuchsiaHandleInfoKHR* in_struct);
- safe_VkMemoryGetFuchsiaHandleInfoKHR(const safe_VkMemoryGetFuchsiaHandleInfoKHR& src);
- safe_VkMemoryGetFuchsiaHandleInfoKHR& operator=(const safe_VkMemoryGetFuchsiaHandleInfoKHR& src);
- safe_VkMemoryGetFuchsiaHandleInfoKHR();
- ~safe_VkMemoryGetFuchsiaHandleInfoKHR();
- void initialize(const VkMemoryGetFuchsiaHandleInfoKHR* in_struct);
- void initialize(const safe_VkMemoryGetFuchsiaHandleInfoKHR* src);
- VkMemoryGetFuchsiaHandleInfoKHR *ptr() { return reinterpret_cast<VkMemoryGetFuchsiaHandleInfoKHR *>(this); }
- VkMemoryGetFuchsiaHandleInfoKHR const *ptr() const { return reinterpret_cast<VkMemoryGetFuchsiaHandleInfoKHR const *>(this); }
-};
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-struct safe_VkImportSemaphoreFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkSemaphore semaphore;
- VkSemaphoreImportFlags flags;
- VkExternalSemaphoreHandleTypeFlagBits handleType;
- uint32_t handle;
- safe_VkImportSemaphoreFuchsiaHandleInfoKHR(const VkImportSemaphoreFuchsiaHandleInfoKHR* in_struct);
- safe_VkImportSemaphoreFuchsiaHandleInfoKHR(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR& src);
- safe_VkImportSemaphoreFuchsiaHandleInfoKHR& operator=(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR& src);
- safe_VkImportSemaphoreFuchsiaHandleInfoKHR();
- ~safe_VkImportSemaphoreFuchsiaHandleInfoKHR();
- void initialize(const VkImportSemaphoreFuchsiaHandleInfoKHR* in_struct);
- void initialize(const safe_VkImportSemaphoreFuchsiaHandleInfoKHR* src);
- VkImportSemaphoreFuchsiaHandleInfoKHR *ptr() { return reinterpret_cast<VkImportSemaphoreFuchsiaHandleInfoKHR *>(this); }
- VkImportSemaphoreFuchsiaHandleInfoKHR const *ptr() const { return reinterpret_cast<VkImportSemaphoreFuchsiaHandleInfoKHR const *>(this); }
-};
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-struct safe_VkSemaphoreGetFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkSemaphore semaphore;
- VkExternalSemaphoreHandleTypeFlagBits handleType;
- safe_VkSemaphoreGetFuchsiaHandleInfoKHR(const VkSemaphoreGetFuchsiaHandleInfoKHR* in_struct);
- safe_VkSemaphoreGetFuchsiaHandleInfoKHR(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR& src);
- safe_VkSemaphoreGetFuchsiaHandleInfoKHR& operator=(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR& src);
- safe_VkSemaphoreGetFuchsiaHandleInfoKHR();
- ~safe_VkSemaphoreGetFuchsiaHandleInfoKHR();
- void initialize(const VkSemaphoreGetFuchsiaHandleInfoKHR* in_struct);
- void initialize(const safe_VkSemaphoreGetFuchsiaHandleInfoKHR* src);
- VkSemaphoreGetFuchsiaHandleInfoKHR *ptr() { return reinterpret_cast<VkSemaphoreGetFuchsiaHandleInfoKHR *>(this); }
- VkSemaphoreGetFuchsiaHandleInfoKHR const *ptr() const { return reinterpret_cast<VkSemaphoreGetFuchsiaHandleInfoKHR const *>(this); }
-};
-#endif // VK_USE_PLATFORM_FUCHSIA
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct safe_VkMagmaSurfaceCreateInfoKHR {
VkStructureType sType;
const void* pNext;
diff --git a/build-fuchsia/generated/include/vk_typemap_helper.h b/build-fuchsia/generated/include/vk_typemap_helper.h
index 25809c3..abf1c1f 100644
--- a/build-fuchsia/generated/include/vk_typemap_helper.h
+++ b/build-fuchsia/generated/include/vk_typemap_helper.h
@@ -1471,61 +1471,6 @@
};
#ifdef VK_USE_PLATFORM_FUCHSIA
-// Map type VkImportMemoryFuchsiaHandleInfoKHR to id VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR
-template <> struct LvlTypeMap<VkImportMemoryFuchsiaHandleInfoKHR> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR> {
- typedef VkImportMemoryFuchsiaHandleInfoKHR Type;
-};
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-// Map type VkMemoryFuchsiaHandlePropertiesKHR to id VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR
-template <> struct LvlTypeMap<VkMemoryFuchsiaHandlePropertiesKHR> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR> {
- typedef VkMemoryFuchsiaHandlePropertiesKHR Type;
-};
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-// Map type VkMemoryGetFuchsiaHandleInfoKHR to id VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR
-template <> struct LvlTypeMap<VkMemoryGetFuchsiaHandleInfoKHR> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR> {
- typedef VkMemoryGetFuchsiaHandleInfoKHR Type;
-};
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-// Map type VkImportSemaphoreFuchsiaHandleInfoKHR to id VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR
-template <> struct LvlTypeMap<VkImportSemaphoreFuchsiaHandleInfoKHR> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR> {
- typedef VkImportSemaphoreFuchsiaHandleInfoKHR Type;
-};
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
-// Map type VkSemaphoreGetFuchsiaHandleInfoKHR to id VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR
-template <> struct LvlTypeMap<VkSemaphoreGetFuchsiaHandleInfoKHR> {
- static const VkStructureType kSType = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR;
-};
-
-template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR> {
- typedef VkSemaphoreGetFuchsiaHandleInfoKHR Type;
-};
-
-#endif // VK_USE_PLATFORM_FUCHSIA
-#ifdef VK_USE_PLATFORM_FUCHSIA
// Map type VkMagmaSurfaceCreateInfoKHR to id VK_STRUCTURE_TYPE_MAGMA_SURFACE_CREATE_INFO_KHR
template <> struct LvlTypeMap<VkMagmaSurfaceCreateInfoKHR> {
static const VkStructureType kSType = VK_STRUCTURE_TYPE_MAGMA_SURFACE_CREATE_INFO_KHR;
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index 3d1543e..645201d 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -1934,18 +1934,6 @@
{
return ::vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties);
}
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VkResult vkGetMemoryFuchsiaHandleKHR( VkDevice device, const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle ) const
- {
- return ::vkGetMemoryFuchsiaHandleKHR( device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VkResult vkGetMemoryFuchsiaHandlePropertiesKHR( VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties ) const
- {
- return ::vkGetMemoryFuchsiaHandlePropertiesKHR( device, handleType, fuchsiaHandle, pMemoryFuchsiaHandleProperties);
- }
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
VkResult vkGetMemoryHostPointerPropertiesEXT( VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void* pHostPointer, VkMemoryHostPointerPropertiesEXT* pMemoryHostPointerProperties ) const
{
return ::vkGetMemoryHostPointerPropertiesEXT( device, handleType, pHostPointer, pMemoryHostPointerProperties);
@@ -2206,12 +2194,6 @@
{
return ::vkGetSemaphoreFdKHR( device, pGetFdInfo, pFd);
}
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VkResult vkGetSemaphoreFuchsiaHandleKHR( VkDevice device, const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle ) const
- {
- return ::vkGetSemaphoreFuchsiaHandleKHR( device, pGetFuchsiaHandleInfo, pFuchsiaHandle);
- }
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
VkResult vkGetSemaphoreWin32HandleKHR( VkDevice device, const VkSemaphoreGetWin32HandleInfoKHR* pGetWin32HandleInfo, HANDLE* pHandle ) const
{
@@ -2258,12 +2240,6 @@
{
return ::vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo);
}
-#ifdef VK_USE_PLATFORM_FUCHSIA
- VkResult vkImportSemaphoreFuchsiaHandleKHR( VkDevice device, const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo ) const
- {
- return ::vkImportSemaphoreFuchsiaHandleKHR( device, pImportSemaphoreFuchsiaHandleInfo);
- }
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
VkResult vkImportSemaphoreWin32HandleKHR( VkDevice device, const VkImportSemaphoreWin32HandleInfoKHR* pImportSemaphoreWin32HandleInfo ) const
{
@@ -9209,11 +9185,6 @@
ePhysicalDeviceVertexAttributeDivisorPropertiesEXT = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT,
ePipelineVertexInputDivisorStateCreateInfoEXT = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT,
eImagepipeSurfaceCreateInfoFUCHSIA = VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA,
- eImportMemoryFuchsiaHandleInfoKHR = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR,
- eMemoryFuchsiaHandlePropertiesKHR = VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR,
- eMemoryGetFuchsiaHandleInfoKHR = VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR,
- eImportSemaphoreFuchsiaHandleInfoKHR = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR,
- eSemaphoreGetFuchsiaHandleInfoKHR = VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR,
eMagmaSurfaceCreateInfoKHR = VK_STRUCTURE_TYPE_MAGMA_SURFACE_CREATE_INFO_KHR,
eBufferCollectionCreateInfoFUCHSIA = VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA,
eFuchsiaImageFormatFUCHSIA = VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA,
@@ -13477,41 +13448,6 @@
static_assert( sizeof( MemoryFdPropertiesKHR ) == sizeof( VkMemoryFdPropertiesKHR ), "struct and wrapper have different size!" );
#ifdef VK_USE_PLATFORM_FUCHSIA
- struct MemoryFuchsiaHandlePropertiesKHR
- {
- operator VkMemoryFuchsiaHandlePropertiesKHR const&() const
- {
- return *reinterpret_cast<const VkMemoryFuchsiaHandlePropertiesKHR*>(this);
- }
-
- operator VkMemoryFuchsiaHandlePropertiesKHR &()
- {
- return *reinterpret_cast<VkMemoryFuchsiaHandlePropertiesKHR*>(this);
- }
-
- bool operator==( MemoryFuchsiaHandlePropertiesKHR const& rhs ) const
- {
- return ( sType == rhs.sType )
- && ( pNext == rhs.pNext )
- && ( memoryTypeBits == rhs.memoryTypeBits );
- }
-
- bool operator!=( MemoryFuchsiaHandlePropertiesKHR const& rhs ) const
- {
- return !operator==( rhs );
- }
-
- private:
- StructureType sType = StructureType::eMemoryFuchsiaHandlePropertiesKHR;
-
- public:
- void* pNext = nullptr;
- uint32_t memoryTypeBits;
- };
- static_assert( sizeof( MemoryFuchsiaHandlePropertiesKHR ) == sizeof( VkMemoryFuchsiaHandlePropertiesKHR ), "struct and wrapper have different size!" );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct MemoryZirconHandlePropertiesFUCHSIA
{
operator VkMemoryZirconHandlePropertiesFUCHSIA const&() const
@@ -28250,7 +28186,6 @@
eAndroidHardwareBufferANDROID = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID,
eHostAllocationEXT = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT,
eHostMappedForeignMemoryEXT = VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT,
- eFuchsiaVmoKHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR,
eTempZirconVmoFUCHSIA = VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA
};
@@ -28270,7 +28205,7 @@
{
enum
{
- allFlags = VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueFd) | VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueWin32) | VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D11Texture) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D11TextureKmt) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D12Heap) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D12Resource) | VkFlags(ExternalMemoryHandleTypeFlagBits::eDmaBufEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID) | VkFlags(ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eFuchsiaVmoKHR) | VkFlags(ExternalMemoryHandleTypeFlagBits::eTempZirconVmoFUCHSIA)
+ allFlags = VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueFd) | VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueWin32) | VkFlags(ExternalMemoryHandleTypeFlagBits::eOpaqueWin32Kmt) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D11Texture) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D11TextureKmt) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D12Heap) | VkFlags(ExternalMemoryHandleTypeFlagBits::eD3D12Resource) | VkFlags(ExternalMemoryHandleTypeFlagBits::eDmaBufEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID) | VkFlags(ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT) | VkFlags(ExternalMemoryHandleTypeFlagBits::eTempZirconVmoFUCHSIA)
};
};
@@ -28689,78 +28624,6 @@
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
#ifdef VK_USE_PLATFORM_FUCHSIA
- struct ImportMemoryFuchsiaHandleInfoKHR
- {
- ImportMemoryFuchsiaHandleInfoKHR( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
- uint32_t handle_ = 0 )
- : handleType( handleType_ )
- , handle( handle_ )
- {
- }
-
- ImportMemoryFuchsiaHandleInfoKHR( VkImportMemoryFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( ImportMemoryFuchsiaHandleInfoKHR ) );
- }
-
- ImportMemoryFuchsiaHandleInfoKHR& operator=( VkImportMemoryFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( ImportMemoryFuchsiaHandleInfoKHR ) );
- return *this;
- }
- ImportMemoryFuchsiaHandleInfoKHR& setPNext( const void* pNext_ )
- {
- pNext = pNext_;
- return *this;
- }
-
- ImportMemoryFuchsiaHandleInfoKHR& setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ )
- {
- handleType = handleType_;
- return *this;
- }
-
- ImportMemoryFuchsiaHandleInfoKHR& setHandle( uint32_t handle_ )
- {
- handle = handle_;
- return *this;
- }
-
- operator VkImportMemoryFuchsiaHandleInfoKHR const&() const
- {
- return *reinterpret_cast<const VkImportMemoryFuchsiaHandleInfoKHR*>(this);
- }
-
- operator VkImportMemoryFuchsiaHandleInfoKHR &()
- {
- return *reinterpret_cast<VkImportMemoryFuchsiaHandleInfoKHR*>(this);
- }
-
- bool operator==( ImportMemoryFuchsiaHandleInfoKHR const& rhs ) const
- {
- return ( sType == rhs.sType )
- && ( pNext == rhs.pNext )
- && ( handleType == rhs.handleType )
- && ( handle == rhs.handle );
- }
-
- bool operator!=( ImportMemoryFuchsiaHandleInfoKHR const& rhs ) const
- {
- return !operator==( rhs );
- }
-
- private:
- StructureType sType = StructureType::eImportMemoryFuchsiaHandleInfoKHR;
-
- public:
- const void* pNext = nullptr;
- ExternalMemoryHandleTypeFlagBits handleType;
- uint32_t handle;
- };
- static_assert( sizeof( ImportMemoryFuchsiaHandleInfoKHR ) == sizeof( VkImportMemoryFuchsiaHandleInfoKHR ), "struct and wrapper have different size!" );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct ImportMemoryZirconHandleInfoFUCHSIA
{
ImportMemoryZirconHandleInfoFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd,
@@ -29045,78 +28908,6 @@
static_assert( sizeof( MemoryGetFdInfoKHR ) == sizeof( VkMemoryGetFdInfoKHR ), "struct and wrapper have different size!" );
#ifdef VK_USE_PLATFORM_FUCHSIA
- struct MemoryGetFuchsiaHandleInfoKHR
- {
- MemoryGetFuchsiaHandleInfoKHR( DeviceMemory memory_ = DeviceMemory(),
- ExternalMemoryHandleTypeFlagBits handleType_ = ExternalMemoryHandleTypeFlagBits::eOpaqueFd )
- : memory( memory_ )
- , handleType( handleType_ )
- {
- }
-
- MemoryGetFuchsiaHandleInfoKHR( VkMemoryGetFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( MemoryGetFuchsiaHandleInfoKHR ) );
- }
-
- MemoryGetFuchsiaHandleInfoKHR& operator=( VkMemoryGetFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( MemoryGetFuchsiaHandleInfoKHR ) );
- return *this;
- }
- MemoryGetFuchsiaHandleInfoKHR& setPNext( const void* pNext_ )
- {
- pNext = pNext_;
- return *this;
- }
-
- MemoryGetFuchsiaHandleInfoKHR& setMemory( DeviceMemory memory_ )
- {
- memory = memory_;
- return *this;
- }
-
- MemoryGetFuchsiaHandleInfoKHR& setHandleType( ExternalMemoryHandleTypeFlagBits handleType_ )
- {
- handleType = handleType_;
- return *this;
- }
-
- operator VkMemoryGetFuchsiaHandleInfoKHR const&() const
- {
- return *reinterpret_cast<const VkMemoryGetFuchsiaHandleInfoKHR*>(this);
- }
-
- operator VkMemoryGetFuchsiaHandleInfoKHR &()
- {
- return *reinterpret_cast<VkMemoryGetFuchsiaHandleInfoKHR*>(this);
- }
-
- bool operator==( MemoryGetFuchsiaHandleInfoKHR const& rhs ) const
- {
- return ( sType == rhs.sType )
- && ( pNext == rhs.pNext )
- && ( memory == rhs.memory )
- && ( handleType == rhs.handleType );
- }
-
- bool operator!=( MemoryGetFuchsiaHandleInfoKHR const& rhs ) const
- {
- return !operator==( rhs );
- }
-
- private:
- StructureType sType = StructureType::eMemoryGetFuchsiaHandleInfoKHR;
-
- public:
- const void* pNext = nullptr;
- DeviceMemory memory;
- ExternalMemoryHandleTypeFlagBits handleType;
- };
- static_assert( sizeof( MemoryGetFuchsiaHandleInfoKHR ) == sizeof( VkMemoryGetFuchsiaHandleInfoKHR ), "struct and wrapper have different size!" );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct MemoryGetZirconHandleInfoFUCHSIA
{
MemoryGetZirconHandleInfoFUCHSIA( DeviceMemory memory_ = DeviceMemory(),
@@ -29404,7 +29195,6 @@
eD3D12FenceKHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT,
eSyncFd = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
eSyncFdKHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
- eFuchsiaFenceKHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR,
eTempZirconEventFUCHSIA = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA
};
@@ -29424,7 +29214,7 @@
{
enum
{
- allFlags = VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eSyncFd) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eFuchsiaFenceKHR) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eTempZirconEventFUCHSIA)
+ allFlags = VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eSyncFd) | VkFlags(ExternalSemaphoreHandleTypeFlagBits::eTempZirconEventFUCHSIA)
};
};
@@ -29697,78 +29487,6 @@
static_assert( sizeof( SemaphoreGetFdInfoKHR ) == sizeof( VkSemaphoreGetFdInfoKHR ), "struct and wrapper have different size!" );
#ifdef VK_USE_PLATFORM_FUCHSIA
- struct SemaphoreGetFuchsiaHandleInfoKHR
- {
- SemaphoreGetFuchsiaHandleInfoKHR( Semaphore semaphore_ = Semaphore(),
- ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd )
- : semaphore( semaphore_ )
- , handleType( handleType_ )
- {
- }
-
- SemaphoreGetFuchsiaHandleInfoKHR( VkSemaphoreGetFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( SemaphoreGetFuchsiaHandleInfoKHR ) );
- }
-
- SemaphoreGetFuchsiaHandleInfoKHR& operator=( VkSemaphoreGetFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( SemaphoreGetFuchsiaHandleInfoKHR ) );
- return *this;
- }
- SemaphoreGetFuchsiaHandleInfoKHR& setPNext( const void* pNext_ )
- {
- pNext = pNext_;
- return *this;
- }
-
- SemaphoreGetFuchsiaHandleInfoKHR& setSemaphore( Semaphore semaphore_ )
- {
- semaphore = semaphore_;
- return *this;
- }
-
- SemaphoreGetFuchsiaHandleInfoKHR& setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ )
- {
- handleType = handleType_;
- return *this;
- }
-
- operator VkSemaphoreGetFuchsiaHandleInfoKHR const&() const
- {
- return *reinterpret_cast<const VkSemaphoreGetFuchsiaHandleInfoKHR*>(this);
- }
-
- operator VkSemaphoreGetFuchsiaHandleInfoKHR &()
- {
- return *reinterpret_cast<VkSemaphoreGetFuchsiaHandleInfoKHR*>(this);
- }
-
- bool operator==( SemaphoreGetFuchsiaHandleInfoKHR const& rhs ) const
- {
- return ( sType == rhs.sType )
- && ( pNext == rhs.pNext )
- && ( semaphore == rhs.semaphore )
- && ( handleType == rhs.handleType );
- }
-
- bool operator!=( SemaphoreGetFuchsiaHandleInfoKHR const& rhs ) const
- {
- return !operator==( rhs );
- }
-
- private:
- StructureType sType = StructureType::eSemaphoreGetFuchsiaHandleInfoKHR;
-
- public:
- const void* pNext = nullptr;
- Semaphore semaphore;
- ExternalSemaphoreHandleTypeFlagBits handleType;
- };
- static_assert( sizeof( SemaphoreGetFuchsiaHandleInfoKHR ) == sizeof( VkSemaphoreGetFuchsiaHandleInfoKHR ), "struct and wrapper have different size!" );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct SemaphoreGetZirconHandleInfoFUCHSIA
{
SemaphoreGetZirconHandleInfoFUCHSIA( Semaphore semaphore_ = Semaphore(),
@@ -30130,98 +29848,6 @@
static_assert( sizeof( ImportSemaphoreFdInfoKHR ) == sizeof( VkImportSemaphoreFdInfoKHR ), "struct and wrapper have different size!" );
#ifdef VK_USE_PLATFORM_FUCHSIA
- struct ImportSemaphoreFuchsiaHandleInfoKHR
- {
- ImportSemaphoreFuchsiaHandleInfoKHR( Semaphore semaphore_ = Semaphore(),
- SemaphoreImportFlags flags_ = SemaphoreImportFlags(),
- ExternalSemaphoreHandleTypeFlagBits handleType_ = ExternalSemaphoreHandleTypeFlagBits::eOpaqueFd,
- uint32_t handle_ = 0 )
- : semaphore( semaphore_ )
- , flags( flags_ )
- , handleType( handleType_ )
- , handle( handle_ )
- {
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR( VkImportSemaphoreFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( ImportSemaphoreFuchsiaHandleInfoKHR ) );
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR& operator=( VkImportSemaphoreFuchsiaHandleInfoKHR const & rhs )
- {
- memcpy( this, &rhs, sizeof( ImportSemaphoreFuchsiaHandleInfoKHR ) );
- return *this;
- }
- ImportSemaphoreFuchsiaHandleInfoKHR& setPNext( const void* pNext_ )
- {
- pNext = pNext_;
- return *this;
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR& setSemaphore( Semaphore semaphore_ )
- {
- semaphore = semaphore_;
- return *this;
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR& setFlags( SemaphoreImportFlags flags_ )
- {
- flags = flags_;
- return *this;
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR& setHandleType( ExternalSemaphoreHandleTypeFlagBits handleType_ )
- {
- handleType = handleType_;
- return *this;
- }
-
- ImportSemaphoreFuchsiaHandleInfoKHR& setHandle( uint32_t handle_ )
- {
- handle = handle_;
- return *this;
- }
-
- operator VkImportSemaphoreFuchsiaHandleInfoKHR const&() const
- {
- return *reinterpret_cast<const VkImportSemaphoreFuchsiaHandleInfoKHR*>(this);
- }
-
- operator VkImportSemaphoreFuchsiaHandleInfoKHR &()
- {
- return *reinterpret_cast<VkImportSemaphoreFuchsiaHandleInfoKHR*>(this);
- }
-
- bool operator==( ImportSemaphoreFuchsiaHandleInfoKHR const& rhs ) const
- {
- return ( sType == rhs.sType )
- && ( pNext == rhs.pNext )
- && ( semaphore == rhs.semaphore )
- && ( flags == rhs.flags )
- && ( handleType == rhs.handleType )
- && ( handle == rhs.handle );
- }
-
- bool operator!=( ImportSemaphoreFuchsiaHandleInfoKHR const& rhs ) const
- {
- return !operator==( rhs );
- }
-
- private:
- StructureType sType = StructureType::eImportSemaphoreFuchsiaHandleInfoKHR;
-
- public:
- const void* pNext = nullptr;
- Semaphore semaphore;
- SemaphoreImportFlags flags;
- ExternalSemaphoreHandleTypeFlagBits handleType;
- uint32_t handle;
- };
- static_assert( sizeof( ImportSemaphoreFuchsiaHandleInfoKHR ) == sizeof( VkImportSemaphoreFuchsiaHandleInfoKHR ), "struct and wrapper have different size!" );
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
struct ImportSemaphoreZirconHandleInfoFUCHSIA
{
ImportSemaphoreZirconHandleInfoFUCHSIA( Semaphore semaphore_ = Semaphore(),
@@ -36257,15 +35883,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch = DispatchLoaderStatic>
- Result getMemoryFuchsiaHandleKHR( const MemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle, Dispatch const &d = Dispatch() ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch = DispatchLoaderStatic>
- ResultValueType<uint32_t>::type getMemoryFuchsiaHandleKHR( const MemoryGetFuchsiaHandleInfoKHR & getFuchsiaHandleInfo, Dispatch const &d = Dispatch() ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch = DispatchLoaderStatic>
Result getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle, Dispatch const &d = Dispatch() ) const;
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
template<typename Dispatch = DispatchLoaderStatic>
@@ -36275,15 +35892,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch = DispatchLoaderStatic>
- Result getMemoryFuchsiaHandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, MemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties, Dispatch const &d = Dispatch() ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch = DispatchLoaderStatic>
- ResultValueType<MemoryFuchsiaHandlePropertiesKHR>::type getMemoryFuchsiaHandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, Dispatch const &d = Dispatch() ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch = DispatchLoaderStatic>
Result getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t ZirconHandle, MemoryZirconHandlePropertiesFUCHSIA* pMemoryZirconHandleProperties, Dispatch const &d = Dispatch() ) const;
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
template<typename Dispatch = DispatchLoaderStatic>
@@ -36325,15 +35933,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch = DispatchLoaderStatic>
- Result getSemaphoreFuchsiaHandleKHR( const SemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle, Dispatch const &d = Dispatch() ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch = DispatchLoaderStatic>
- ResultValueType<uint32_t>::type getSemaphoreFuchsiaHandleKHR( const SemaphoreGetFuchsiaHandleInfoKHR & getFuchsiaHandleInfo, Dispatch const &d = Dispatch() ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch = DispatchLoaderStatic>
Result getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle, Dispatch const &d = Dispatch() ) const;
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
template<typename Dispatch = DispatchLoaderStatic>
@@ -36343,15 +35942,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch = DispatchLoaderStatic>
- Result importSemaphoreFuchsiaHandleKHR( const ImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo, Dispatch const &d = Dispatch() ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch = DispatchLoaderStatic>
- ResultValueType<void>::type importSemaphoreFuchsiaHandleKHR( const ImportSemaphoreFuchsiaHandleInfoKHR & importSemaphoreFuchsiaHandleInfo, Dispatch const &d = Dispatch() ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch = DispatchLoaderStatic>
Result importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo, Dispatch const &d = Dispatch() ) const;
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
template<typename Dispatch = DispatchLoaderStatic>
@@ -39101,23 +38691,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch>
- VULKAN_HPP_INLINE Result Device::getMemoryFuchsiaHandleKHR( const MemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle, Dispatch const &d) const
- {
- return static_cast<Result>( d.vkGetMemoryFuchsiaHandleKHR( m_device, reinterpret_cast<const VkMemoryGetFuchsiaHandleInfoKHR*>( pGetFuchsiaHandleInfo ), pFuchsiaHandle ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch>
- VULKAN_HPP_INLINE ResultValueType<uint32_t>::type Device::getMemoryFuchsiaHandleKHR( const MemoryGetFuchsiaHandleInfoKHR & getFuchsiaHandleInfo, Dispatch const &d ) const
- {
- uint32_t fuchsiaHandle;
- Result result = static_cast<Result>( d.vkGetMemoryFuchsiaHandleKHR( m_device, reinterpret_cast<const VkMemoryGetFuchsiaHandleInfoKHR*>( &getFuchsiaHandleInfo ), &fuchsiaHandle ) );
- return createResultValue( result, fuchsiaHandle, VULKAN_HPP_NAMESPACE_STRING"::Device::getMemoryFuchsiaHandleKHR" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch>
VULKAN_HPP_INLINE Result Device::getMemoryZirconHandleFUCHSIA( const MemoryGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle, Dispatch const &d) const
{
return static_cast<Result>( d.vkGetMemoryZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkMemoryGetZirconHandleInfoFUCHSIA*>( pGetZirconHandleInfo ), pZirconHandle ) );
@@ -39135,23 +38708,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch>
- VULKAN_HPP_INLINE Result Device::getMemoryFuchsiaHandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, MemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties, Dispatch const &d) const
- {
- return static_cast<Result>( d.vkGetMemoryFuchsiaHandlePropertiesKHR( m_device, static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ), fuchsiaHandle, reinterpret_cast<VkMemoryFuchsiaHandlePropertiesKHR*>( pMemoryFuchsiaHandleProperties ) ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch>
- VULKAN_HPP_INLINE ResultValueType<MemoryFuchsiaHandlePropertiesKHR>::type Device::getMemoryFuchsiaHandlePropertiesKHR( ExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, Dispatch const &d ) const
- {
- MemoryFuchsiaHandlePropertiesKHR memoryFuchsiaHandleProperties;
- Result result = static_cast<Result>( d.vkGetMemoryFuchsiaHandlePropertiesKHR( m_device, static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ), fuchsiaHandle, reinterpret_cast<VkMemoryFuchsiaHandlePropertiesKHR*>( &memoryFuchsiaHandleProperties ) ) );
- return createResultValue( result, memoryFuchsiaHandleProperties, VULKAN_HPP_NAMESPACE_STRING"::Device::getMemoryFuchsiaHandlePropertiesKHR" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch>
VULKAN_HPP_INLINE Result Device::getMemoryZirconHandlePropertiesFUCHSIA( ExternalMemoryHandleTypeFlagBits handleType, zx_handle_t ZirconHandle, MemoryZirconHandlePropertiesFUCHSIA* pMemoryZirconHandleProperties, Dispatch const &d) const
{
return static_cast<Result>( d.vkGetMemoryZirconHandlePropertiesFUCHSIA( m_device, static_cast<VkExternalMemoryHandleTypeFlagBits>( handleType ), ZirconHandle, reinterpret_cast<VkMemoryZirconHandlePropertiesFUCHSIA*>( pMemoryZirconHandleProperties ) ) );
@@ -39231,23 +38787,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch>
- VULKAN_HPP_INLINE Result Device::getSemaphoreFuchsiaHandleKHR( const SemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle, Dispatch const &d) const
- {
- return static_cast<Result>( d.vkGetSemaphoreFuchsiaHandleKHR( m_device, reinterpret_cast<const VkSemaphoreGetFuchsiaHandleInfoKHR*>( pGetFuchsiaHandleInfo ), pFuchsiaHandle ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch>
- VULKAN_HPP_INLINE ResultValueType<uint32_t>::type Device::getSemaphoreFuchsiaHandleKHR( const SemaphoreGetFuchsiaHandleInfoKHR & getFuchsiaHandleInfo, Dispatch const &d ) const
- {
- uint32_t fuchsiaHandle;
- Result result = static_cast<Result>( d.vkGetSemaphoreFuchsiaHandleKHR( m_device, reinterpret_cast<const VkSemaphoreGetFuchsiaHandleInfoKHR*>( &getFuchsiaHandleInfo ), &fuchsiaHandle ) );
- return createResultValue( result, fuchsiaHandle, VULKAN_HPP_NAMESPACE_STRING"::Device::getSemaphoreFuchsiaHandleKHR" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch>
VULKAN_HPP_INLINE Result Device::getSemaphoreZirconHandleFUCHSIA( const SemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo, zx_handle_t* pZirconHandle, Dispatch const &d) const
{
return static_cast<Result>( d.vkGetSemaphoreZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkSemaphoreGetZirconHandleInfoFUCHSIA*>( pGetZirconHandleInfo ), pZirconHandle ) );
@@ -39265,22 +38804,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
template<typename Dispatch>
- VULKAN_HPP_INLINE Result Device::importSemaphoreFuchsiaHandleKHR( const ImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo, Dispatch const &d) const
- {
- return static_cast<Result>( d.vkImportSemaphoreFuchsiaHandleKHR( m_device, reinterpret_cast<const VkImportSemaphoreFuchsiaHandleInfoKHR*>( pImportSemaphoreFuchsiaHandleInfo ) ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- template<typename Dispatch>
- VULKAN_HPP_INLINE ResultValueType<void>::type Device::importSemaphoreFuchsiaHandleKHR( const ImportSemaphoreFuchsiaHandleInfoKHR & importSemaphoreFuchsiaHandleInfo, Dispatch const &d ) const
- {
- Result result = static_cast<Result>( d.vkImportSemaphoreFuchsiaHandleKHR( m_device, reinterpret_cast<const VkImportSemaphoreFuchsiaHandleInfoKHR*>( &importSemaphoreFuchsiaHandleInfo ) ) );
- return createResultValue( result, VULKAN_HPP_NAMESPACE_STRING"::Device::importSemaphoreFuchsiaHandleKHR" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
- template<typename Dispatch>
VULKAN_HPP_INLINE Result Device::importSemaphoreZirconHandleFUCHSIA( const ImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo, Dispatch const &d) const
{
return static_cast<Result>( d.vkImportSemaphoreZirconHandleFUCHSIA( m_device, reinterpret_cast<const VkImportSemaphoreZirconHandleInfoFUCHSIA*>( pImportSemaphoreZirconHandleInfo ) ) );
@@ -43669,9 +43192,6 @@
template <> struct isStructureChainValid<MemoryAllocateInfo, ImportMemoryWin32HandleInfoKHR>{ enum { value = true }; };
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
#ifdef VK_USE_PLATFORM_FUCHSIA
- template <> struct isStructureChainValid<MemoryAllocateInfo, ImportMemoryFuchsiaHandleInfoKHR>{ enum { value = true }; };
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-#ifdef VK_USE_PLATFORM_FUCHSIA
template <> struct isStructureChainValid<MemoryAllocateInfo, ImportMemoryZirconHandleInfoFUCHSIA>{ enum { value = true }; };
#endif /*VK_USE_PLATFORM_FUCHSIA*/
template <> struct isStructureChainValid<MemoryAllocateInfo, ImportMemoryFdInfoKHR>{ enum { value = true }; };
@@ -45153,11 +44673,6 @@
case StructureType::ePhysicalDeviceVertexAttributeDivisorPropertiesEXT: return "PhysicalDeviceVertexAttributeDivisorPropertiesEXT";
case StructureType::ePipelineVertexInputDivisorStateCreateInfoEXT: return "PipelineVertexInputDivisorStateCreateInfoEXT";
case StructureType::eImagepipeSurfaceCreateInfoFUCHSIA: return "ImagepipeSurfaceCreateInfoFUCHSIA";
- case StructureType::eImportMemoryFuchsiaHandleInfoKHR: return "ImportMemoryFuchsiaHandleInfoKHR";
- case StructureType::eMemoryFuchsiaHandlePropertiesKHR: return "MemoryFuchsiaHandlePropertiesKHR";
- case StructureType::eMemoryGetFuchsiaHandleInfoKHR: return "MemoryGetFuchsiaHandleInfoKHR";
- case StructureType::eImportSemaphoreFuchsiaHandleInfoKHR: return "ImportSemaphoreFuchsiaHandleInfoKHR";
- case StructureType::eSemaphoreGetFuchsiaHandleInfoKHR: return "SemaphoreGetFuchsiaHandleInfoKHR";
case StructureType::eMagmaSurfaceCreateInfoKHR: return "MagmaSurfaceCreateInfoKHR";
case StructureType::eBufferCollectionCreateInfoFUCHSIA: return "BufferCollectionCreateInfoFUCHSIA";
case StructureType::eFuchsiaImageFormatFUCHSIA: return "FuchsiaImageFormatFUCHSIA";
@@ -46455,7 +45970,6 @@
case ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID: return "AndroidHardwareBufferANDROID";
case ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT: return "HostAllocationEXT";
case ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT: return "HostMappedForeignMemoryEXT";
- case ExternalMemoryHandleTypeFlagBits::eFuchsiaVmoKHR: return "FuchsiaVmoKHR";
case ExternalMemoryHandleTypeFlagBits::eTempZirconVmoFUCHSIA: return "TempZirconVmoFUCHSIA";
default: return "invalid";
}
@@ -46476,7 +45990,6 @@
if (value & ExternalMemoryHandleTypeFlagBits::eAndroidHardwareBufferANDROID) result += "AndroidHardwareBufferANDROID | ";
if (value & ExternalMemoryHandleTypeFlagBits::eHostAllocationEXT) result += "HostAllocationEXT | ";
if (value & ExternalMemoryHandleTypeFlagBits::eHostMappedForeignMemoryEXT) result += "HostMappedForeignMemoryEXT | ";
- if (value & ExternalMemoryHandleTypeFlagBits::eFuchsiaVmoKHR) result += "FuchsiaVmoKHR | ";
if (value & ExternalMemoryHandleTypeFlagBits::eTempZirconVmoFUCHSIA) result += "TempZirconVmoFUCHSIA | ";
return "{" + result.substr(0, result.size() - 3) + "}";
}
@@ -46511,7 +46024,6 @@
case ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt: return "OpaqueWin32Kmt";
case ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence: return "D3D12Fence";
case ExternalSemaphoreHandleTypeFlagBits::eSyncFd: return "SyncFd";
- case ExternalSemaphoreHandleTypeFlagBits::eFuchsiaFenceKHR: return "FuchsiaFenceKHR";
case ExternalSemaphoreHandleTypeFlagBits::eTempZirconEventFUCHSIA: return "TempZirconEventFUCHSIA";
default: return "invalid";
}
@@ -46526,7 +46038,6 @@
if (value & ExternalSemaphoreHandleTypeFlagBits::eOpaqueWin32Kmt) result += "OpaqueWin32Kmt | ";
if (value & ExternalSemaphoreHandleTypeFlagBits::eD3D12Fence) result += "D3D12Fence | ";
if (value & ExternalSemaphoreHandleTypeFlagBits::eSyncFd) result += "SyncFd | ";
- if (value & ExternalSemaphoreHandleTypeFlagBits::eFuchsiaFenceKHR) result += "FuchsiaFenceKHR | ";
if (value & ExternalSemaphoreHandleTypeFlagBits::eTempZirconEventFUCHSIA) result += "TempZirconEventFUCHSIA | ";
return "{" + result.substr(0, result.size() - 3) + "}";
}
@@ -47241,12 +46752,6 @@
#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR = 0;
PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR = 0;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetMemoryFuchsiaHandleKHR vkGetMemoryFuchsiaHandleKHR = 0;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetMemoryFuchsiaHandlePropertiesKHR vkGetMemoryFuchsiaHandlePropertiesKHR = 0;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT = 0;
#ifdef VK_USE_PLATFORM_WIN32_KHR
PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR = 0;
@@ -47330,9 +46835,6 @@
PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE = 0;
PFN_vkGetRenderAreaGranularity vkGetRenderAreaGranularity = 0;
PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR = 0;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkGetSemaphoreFuchsiaHandleKHR vkGetSemaphoreFuchsiaHandleKHR = 0;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR = 0;
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
@@ -47349,9 +46851,6 @@
PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR = 0;
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR = 0;
-#ifdef VK_USE_PLATFORM_FUCHSIA
- PFN_vkImportSemaphoreFuchsiaHandleKHR vkImportSemaphoreFuchsiaHandleKHR = 0;
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR = 0;
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
@@ -47647,12 +47146,6 @@
#endif /*VK_USE_PLATFORM_ANDROID_KHR*/
vkGetMemoryFdKHR = PFN_vkGetMemoryFdKHR(device ? device.getProcAddr( "vkGetMemoryFdKHR") : instance.getProcAddr( "vkGetMemoryFdKHR"));
vkGetMemoryFdPropertiesKHR = PFN_vkGetMemoryFdPropertiesKHR(device ? device.getProcAddr( "vkGetMemoryFdPropertiesKHR") : instance.getProcAddr( "vkGetMemoryFdPropertiesKHR"));
-#ifdef VK_USE_PLATFORM_FUCHSIA
- vkGetMemoryFuchsiaHandleKHR = PFN_vkGetMemoryFuchsiaHandleKHR(device ? device.getProcAddr( "vkGetMemoryFuchsiaHandleKHR") : instance.getProcAddr( "vkGetMemoryFuchsiaHandleKHR"));
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
-#ifdef VK_USE_PLATFORM_FUCHSIA
- vkGetMemoryFuchsiaHandlePropertiesKHR = PFN_vkGetMemoryFuchsiaHandlePropertiesKHR(device ? device.getProcAddr( "vkGetMemoryFuchsiaHandlePropertiesKHR") : instance.getProcAddr( "vkGetMemoryFuchsiaHandlePropertiesKHR"));
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
vkGetMemoryHostPointerPropertiesEXT = PFN_vkGetMemoryHostPointerPropertiesEXT(device ? device.getProcAddr( "vkGetMemoryHostPointerPropertiesEXT") : instance.getProcAddr( "vkGetMemoryHostPointerPropertiesEXT"));
#ifdef VK_USE_PLATFORM_WIN32_KHR
vkGetMemoryWin32HandleKHR = PFN_vkGetMemoryWin32HandleKHR(device ? device.getProcAddr( "vkGetMemoryWin32HandleKHR") : instance.getProcAddr( "vkGetMemoryWin32HandleKHR"));
@@ -47736,9 +47229,6 @@
vkGetRefreshCycleDurationGOOGLE = PFN_vkGetRefreshCycleDurationGOOGLE(device ? device.getProcAddr( "vkGetRefreshCycleDurationGOOGLE") : instance.getProcAddr( "vkGetRefreshCycleDurationGOOGLE"));
vkGetRenderAreaGranularity = PFN_vkGetRenderAreaGranularity(device ? device.getProcAddr( "vkGetRenderAreaGranularity") : instance.getProcAddr( "vkGetRenderAreaGranularity"));
vkGetSemaphoreFdKHR = PFN_vkGetSemaphoreFdKHR(device ? device.getProcAddr( "vkGetSemaphoreFdKHR") : instance.getProcAddr( "vkGetSemaphoreFdKHR"));
-#ifdef VK_USE_PLATFORM_FUCHSIA
- vkGetSemaphoreFuchsiaHandleKHR = PFN_vkGetSemaphoreFuchsiaHandleKHR(device ? device.getProcAddr( "vkGetSemaphoreFuchsiaHandleKHR") : instance.getProcAddr( "vkGetSemaphoreFuchsiaHandleKHR"));
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
vkGetSemaphoreWin32HandleKHR = PFN_vkGetSemaphoreWin32HandleKHR(device ? device.getProcAddr( "vkGetSemaphoreWin32HandleKHR") : instance.getProcAddr( "vkGetSemaphoreWin32HandleKHR"));
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
@@ -47755,9 +47245,6 @@
vkImportFenceWin32HandleKHR = PFN_vkImportFenceWin32HandleKHR(device ? device.getProcAddr( "vkImportFenceWin32HandleKHR") : instance.getProcAddr( "vkImportFenceWin32HandleKHR"));
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
vkImportSemaphoreFdKHR = PFN_vkImportSemaphoreFdKHR(device ? device.getProcAddr( "vkImportSemaphoreFdKHR") : instance.getProcAddr( "vkImportSemaphoreFdKHR"));
-#ifdef VK_USE_PLATFORM_FUCHSIA
- vkImportSemaphoreFuchsiaHandleKHR = PFN_vkImportSemaphoreFuchsiaHandleKHR(device ? device.getProcAddr( "vkImportSemaphoreFuchsiaHandleKHR") : instance.getProcAddr( "vkImportSemaphoreFuchsiaHandleKHR"));
-#endif /*VK_USE_PLATFORM_FUCHSIA*/
#ifdef VK_USE_PLATFORM_WIN32_KHR
vkImportSemaphoreWin32HandleKHR = PFN_vkImportSemaphoreWin32HandleKHR(device ? device.getProcAddr( "vkImportSemaphoreWin32HandleKHR") : instance.getProcAddr( "vkImportSemaphoreWin32HandleKHR"));
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
index 44434fb..0b082d1 100644
--- a/include/vulkan/vulkan_core.h
+++ b/include/vulkan/vulkan_core.h
@@ -391,11 +391,6 @@
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000,
VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,
VK_STRUCTURE_TYPE_IMAGEPIPE_SURFACE_CREATE_INFO_FUCHSIA = 1000214000,
- VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR = 1001000000,
- VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR = 1001000001,
- VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR = 1001000002,
- VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR = 1001001000,
- VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR = 1001001001,
VK_STRUCTURE_TYPE_MAGMA_SURFACE_CREATE_INFO_KHR = 1001002000,
VK_STRUCTURE_TYPE_BUFFER_COLLECTION_CREATE_INFO_FUCHSIA = 1001004000,
VK_STRUCTURE_TYPE_FUCHSIA_IMAGE_FORMAT_FUCHSIA = 1001004001,
@@ -3804,7 +3799,6 @@
VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID = 0x00000400,
VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT = 0x00000080,
VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100,
- VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR = 0x00000800,
VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA = 0x00100000,
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT,
@@ -3870,7 +3864,6 @@
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT = 0x00000004,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE_BIT = 0x00000008,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT = 0x00000010,
- VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR = 0x00000020,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA = 0x00100000,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT,
VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT,
diff --git a/include/vulkan/vulkan_fuchsia.h b/include/vulkan/vulkan_fuchsia.h
index b67ad49..f7f4b90 100644
--- a/include/vulkan/vulkan_fuchsia.h
+++ b/include/vulkan/vulkan_fuchsia.h
@@ -27,82 +27,6 @@
*/
-#define VK_KHR_external_memory_fuchsia 1
-#define VK_KHR_EXTERNAL_MEMORY_FUCHSIA_SPEC_VERSION 1
-#define VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME "VK_KHR_external_memory_fuchsia"
-
-typedef struct VkImportMemoryFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkExternalMemoryHandleTypeFlagBits handleType;
- uint32_t handle;
-} VkImportMemoryFuchsiaHandleInfoKHR;
-
-typedef struct VkMemoryFuchsiaHandlePropertiesKHR {
- VkStructureType sType;
- void* pNext;
- uint32_t memoryTypeBits;
-} VkMemoryFuchsiaHandlePropertiesKHR;
-
-typedef struct VkMemoryGetFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkDeviceMemory memory;
- VkExternalMemoryHandleTypeFlagBits handleType;
-} VkMemoryGetFuchsiaHandleInfoKHR;
-
-
-typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryFuchsiaHandleKHR)(VkDevice device, const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle);
-typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryFuchsiaHandlePropertiesKHR)(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, uint32_t fuchsiaHandle, VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFuchsiaHandleKHR(
- VkDevice device,
- const VkMemoryGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetMemoryFuchsiaHandlePropertiesKHR(
- VkDevice device,
- VkExternalMemoryHandleTypeFlagBits handleType,
- uint32_t fuchsiaHandle,
- VkMemoryFuchsiaHandlePropertiesKHR* pMemoryFuchsiaHandleProperties);
-#endif
-
-#define VK_KHR_external_semaphore_fuchsia 1
-#define VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_SPEC_VERSION 1
-#define VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME "VK_KHR_external_semaphore_fuchsia"
-
-typedef struct VkImportSemaphoreFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkSemaphore semaphore;
- VkSemaphoreImportFlags flags;
- VkExternalSemaphoreHandleTypeFlagBits handleType;
- uint32_t handle;
-} VkImportSemaphoreFuchsiaHandleInfoKHR;
-
-typedef struct VkSemaphoreGetFuchsiaHandleInfoKHR {
- VkStructureType sType;
- const void* pNext;
- VkSemaphore semaphore;
- VkExternalSemaphoreHandleTypeFlagBits handleType;
-} VkSemaphoreGetFuchsiaHandleInfoKHR;
-
-
-typedef VkResult (VKAPI_PTR *PFN_vkImportSemaphoreFuchsiaHandleKHR)(VkDevice device, const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo);
-typedef VkResult (VKAPI_PTR *PFN_vkGetSemaphoreFuchsiaHandleKHR)(VkDevice device, const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo, uint32_t* pFuchsiaHandle);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkImportSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkImportSemaphoreFuchsiaHandleInfoKHR* pImportSemaphoreFuchsiaHandleInfo);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkGetSemaphoreFuchsiaHandleKHR(
- VkDevice device,
- const VkSemaphoreGetFuchsiaHandleInfoKHR* pGetFuchsiaHandleInfo,
- uint32_t* pFuchsiaHandle);
-#endif
-
#define VK_KHR_magma_surface 1
#define VK_KHR_MAGMA_SURFACE_SPEC_VERSION 1
#define VK_KHR_MAGMA_SURFACE_EXTENSION_NAME "VK_KHR_magma_surface"
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index cc4dacc..d206f2a 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -10356,24 +10356,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
VKAPI_ATTR VkResult VKAPI_CALL
-ImportSemaphoreFuchsiaHandleKHR(VkDevice device, const VkImportSemaphoreFuchsiaHandleInfoKHR *pImportSemaphoreFuchsiaHandleInfo) {
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- bool skip =
- PreCallValidateImportSemaphore(dev_data, pImportSemaphoreFuchsiaHandleInfo->semaphore, "vkImportSemaphoreFuchsiaHandleKHR");
-
- if (!skip) {
- result = dev_data->dispatch_table.ImportSemaphoreFuchsiaHandleKHR(device, pImportSemaphoreFuchsiaHandleInfo);
- }
-
- if (result == VK_SUCCESS) {
- PostCallRecordImportSemaphore(dev_data, pImportSemaphoreFuchsiaHandleInfo->semaphore,
- pImportSemaphoreFuchsiaHandleInfo->handleType, pImportSemaphoreFuchsiaHandleInfo->flags);
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL
ImportSemaphoreZirconHandleFUCHSIA(VkDevice device, const VkImportSemaphoreZirconHandleInfoFUCHSIA *pImportSemaphoreZirconHandleInfo) {
VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
@@ -10426,16 +10408,6 @@
}
#ifdef VK_USE_PLATFORM_FUCHSIA
-VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreFuchsiaHandleKHR(VkDevice device, const VkSemaphoreGetFuchsiaHandleInfoKHR *pGetFuchsiaHandleInfo, uint32_t *pHandle) {
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- VkResult result = dev_data->dispatch_table.GetSemaphoreFuchsiaHandleKHR(device, pGetFuchsiaHandleInfo, pHandle);
-
- if (result == VK_SUCCESS) {
- PostCallRecordGetSemaphore(dev_data, pGetFuchsiaHandleInfo->semaphore, pGetFuchsiaHandleInfo->handleType);
- }
- return result;
-}
-
VKAPI_ATTR VkResult VKAPI_CALL GetSemaphoreZirconHandleFUCHSIA(VkDevice device, const VkSemaphoreGetZirconHandleInfoFUCHSIA *pGetZirconHandleInfo, uint32_t *pHandle) {
layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
VkResult result = dev_data->dispatch_table.GetSemaphoreZirconHandleFUCHSIA(device, pGetZirconHandleInfo, pHandle);
@@ -12802,8 +12774,6 @@
#ifdef VK_USE_PLATFORM_FUCHSIA
{"vkCreateMagmaSurfaceKHR", (void*)CreateMagmaSurfaceKHR},
{"vkCreateImagePipeSurfaceFUCHSIA", (void*)CreateImagePipeSurfaceFUCHSIA},
- {"vkImportSemaphoreFuchsiaHandleKHR", (void *)ImportSemaphoreFuchsiaHandleKHR},
- {"vkGetSemaphoreFuchsiaHandleKHR", (void *)GetSemaphoreFuchsiaHandleKHR},
{"vkImportSemaphoreZirconHandleFUCHSIA", (void *)ImportSemaphoreZirconHandleFUCHSIA},
{"vkGetSemaphoreZirconHandleFUCHSIA", (void *)GetSemaphoreZirconHandleFUCHSIA},
#endif // VK_USE_PLATFORM_FUCHSIA
diff --git a/scripts/vk.xml b/scripts/vk.xml
index c409971..b7543ae 100644
--- a/scripts/vk.xml
+++ b/scripts/vk.xml
@@ -2053,12 +2053,6 @@
<member><type>DWORD</type> <name>dwAccess</name></member>
<member><type>LPCWSTR</type> <name>name</name></member>
</type>
- <type category="struct" name="VkImportMemoryFuchsiaHandleInfoKHR" structextends="VkMemoryAllocateInfo">
- <member values="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
- <member>const <type>void</type>* <name>pNext</name></member>
- <member optional="true"><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member>
- <member optional="true"><type>uint32_t</type> <name>handle</name></member>
- </type>
<type category="struct" name="VkImportMemoryZirconHandleInfoFUCHSIA" structextends="VkMemoryAllocateInfo">
<member values="VK_STRUCTURE_TYPE_TEMP_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
@@ -2093,22 +2087,11 @@
<member><type>VkDeviceMemory</type> <name>memory</name></member>
<member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member>
</type>
- <type category="struct" name="VkMemoryFuchsiaHandlePropertiesKHR" returnedonly="true">
- <member values="VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR"><type>VkStructureType</type> <name>sType</name></member>
- <member><type>void</type>* <name>pNext</name></member>
- <member><type>uint32_t</type> <name>memoryTypeBits</name></member>
- </type>
<type category="struct" name="VkMemoryZirconHandlePropertiesFUCHSIA" returnedonly="true">
<member values="VK_STRUCTURE_TYPE_TEMP_MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member><type>void</type>* <name>pNext</name></member>
<member><type>zx_handle_t</type> <name>memoryTypeBits</name></member>
</type>
- <type category="struct" name="VkMemoryGetFuchsiaHandleInfoKHR">
- <member values="VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
- <member>const <type>void</type>* <name>pNext</name></member>
- <member><type>VkDeviceMemory</type> <name>memory</name></member>
- <member><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></member>
- </type>
<type category="struct" name="VkMemoryGetZirconHandleInfoFUCHSIA">
<member values="VK_STRUCTURE_TYPE_TEMP_MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
@@ -2219,14 +2202,6 @@
<member><type>VkSemaphore</type> <name>semaphore</name></member>
<member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member>
</type>
- <type category="struct" name="VkImportSemaphoreFuchsiaHandleInfoKHR">
- <member values="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
- <member>const <type>void</type>* <name>pNext</name></member>
- <member externsync="true"><type>VkSemaphore</type> <name>semaphore</name></member>
- <member optional="true"><type>VkSemaphoreImportFlags</type> <name>flags</name></member>
- <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member>
- <member><type>uint32_t</type> <name>handle</name></member>
- </type>
<type category="struct" name="VkImportSemaphoreZirconHandleInfoFUCHSIA">
<member values="VK_STRUCTURE_TYPE_TEMP_IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
@@ -2235,12 +2210,6 @@
<member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member>
<member><type>zx_handle_t</type> <name>handle</name></member>
</type>
- <type category="struct" name="VkSemaphoreGetFuchsiaHandleInfoKHR">
- <member values="VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR"><type>VkStructureType</type> <name>sType</name></member>
- <member>const <type>void</type>* <name>pNext</name></member>
- <member><type>VkSemaphore</type> <name>semaphore</name></member>
- <member><type>VkExternalSemaphoreHandleTypeFlagBits</type> <name>handleType</name></member>
- </type>
<type category="struct" name="VkSemaphoreGetZirconHandleInfoFUCHSIA">
<member values="VK_STRUCTURE_TYPE_TEMP_SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA"><type>VkStructureType</type> <name>sType</name></member>
<member>const <type>void</type>* <name>pNext</name></member>
@@ -5680,25 +5649,12 @@
<param><type>VkMemoryFdPropertiesKHR</type>* <name>pMemoryFdProperties</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY">
- <proto><type>VkResult</type> <name>vkGetMemoryFuchsiaHandleKHR</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param>const <type>VkMemoryGetFuchsiaHandleInfoKHR</type>* <name>pGetFuchsiaHandleInfo</name></param>
- <param><type>uint32_t</type>* <name>pFuchsiaHandle</name></param>
- </command>
- <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY">
<proto><type>VkResult</type> <name>vkGetMemoryZirconHandleFUCHSIA</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param>const <type>VkMemoryGetZirconHandleInfoFUCHSIA</type>* <name>pGetZirconHandleInfo</name></param>
<param><type>zx_handle_t</type>* <name>pZirconHandle</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR">
- <proto><type>VkResult</type> <name>vkGetMemoryFuchsiaHandlePropertiesKHR</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></param>
- <param><type>uint32_t</type> <name>fuchsiaHandle</name></param>
- <param><type>VkMemoryFuchsiaHandlePropertiesKHR</type>* <name>pMemoryFuchsiaHandleProperties</name></param>
- </command>
- <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR">
<proto><type>VkResult</type> <name>vkGetMemoryZirconHandlePropertiesFUCHSIA</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param><type>VkExternalMemoryHandleTypeFlagBits</type> <name>handleType</name></param>
@@ -5735,23 +5691,12 @@
<param>const <type>VkImportSemaphoreFdInfoKHR</type>* <name>pImportSemaphoreFdInfo</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY">
- <proto><type>VkResult</type> <name>vkGetSemaphoreFuchsiaHandleKHR</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param>const <type>VkSemaphoreGetFuchsiaHandleInfoKHR</type>* <name>pGetFuchsiaHandleInfo</name></param>
- <param><type>uint32_t</type>* <name>pFuchsiaHandle</name></param>
- </command>
- <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_TOO_MANY_OBJECTS,VK_ERROR_OUT_OF_HOST_MEMORY">
<proto><type>VkResult</type> <name>vkGetSemaphoreZirconHandleFUCHSIA</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param>const <type>VkSemaphoreGetZirconHandleInfoFUCHSIA</type>* <name>pGetZirconHandleInfo</name></param>
<param><type>zx_handle_t</type>* <name>pZirconHandle</name></param>
</command>
<command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR">
- <proto><type>VkResult</type> <name>vkImportSemaphoreFuchsiaHandleKHR</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param>const <type>VkImportSemaphoreFuchsiaHandleInfoKHR</type>* <name>pImportSemaphoreFuchsiaHandleInfo</name></param>
- </command>
- <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY,VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR">
<proto><type>VkResult</type> <name>vkImportSemaphoreZirconHandleFUCHSIA</name></proto>
<param><type>VkDevice</type> <name>device</name></param>
<param>const <type>VkImportSemaphoreZirconHandleInfoFUCHSIA</type>* <name>pImportSemaphoreZirconHandleInfo</name></param>
@@ -8908,34 +8853,6 @@
<command name="vkCreateImagePipeSurfaceFUCHSIA"/>
</require>
</extension>
- <extension name="VK_KHR_external_memory_fuchsia" number="1001" type="device" requires="VK_KHR_external_memory_capabilities,VK_KHR_external_memory" author="KHR" contact="Craig Stout @cdotstout" supported="vulkan" platform="fuchsia">
- <require>
- <enum value="1" name="VK_KHR_EXTERNAL_MEMORY_FUCHSIA_SPEC_VERSION"/>
- <enum value=""VK_KHR_external_memory_fuchsia"" name="VK_KHR_EXTERNAL_MEMORY_FUCHSIA_EXTENSION_NAME"/>
- <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_MEMORY_FUCHSIA_HANDLE_INFO_KHR"/>
- <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_FUCHSIA_HANDLE_PROPERTIES_KHR"/>
- <enum offset="2" extends="VkStructureType" name="VK_STRUCTURE_TYPE_MEMORY_GET_FUCHSIA_HANDLE_INFO_KHR"/>
- <enum bitpos="11" extends="VkExternalMemoryHandleTypeFlagBits" name="VK_EXTERNAL_MEMORY_HANDLE_TYPE_FUCHSIA_VMO_BIT_KHR"/>
- <type name="VkImportMemoryFuchsiaHandleInfoKHR"/>
- <type name="VkMemoryFuchsiaHandlePropertiesKHR"/>
- <type name="VkMemoryGetFuchsiaHandleInfoKHR"/>
- <command name="vkGetMemoryFuchsiaHandleKHR"/>
- <command name="vkGetMemoryFuchsiaHandlePropertiesKHR"/>
- </require>
- </extension>
- <extension name="VK_KHR_external_semaphore_fuchsia" number="1002" type="device" requires="VK_KHR_external_semaphore_capabilities,VK_KHR_external_semaphore" author="KHR" contact="Craig Stout @cdotstout" supported="vulkan" platform="fuchsia">
- <require>
- <enum value="1" name="VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_SPEC_VERSION"/>
- <enum value=""VK_KHR_external_semaphore_fuchsia"" name="VK_KHR_EXTERNAL_SEMAPHORE_FUCHSIA_EXTENSION_NAME"/>
- <enum offset="0" extends="VkStructureType" name="VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FUCHSIA_HANDLE_INFO_KHR"/>
- <enum offset="1" extends="VkStructureType" name="VK_STRUCTURE_TYPE_SEMAPHORE_GET_FUCHSIA_HANDLE_INFO_KHR"/>
- <enum bitpos="5" extends="VkExternalSemaphoreHandleTypeFlagBits" name="VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FUCHSIA_FENCE_BIT_KHR"/>
- <type name="VkImportSemaphoreFuchsiaHandleInfoKHR"/>
- <type name="VkSemaphoreGetFuchsiaHandleInfoKHR"/>
- <command name="vkImportSemaphoreFuchsiaHandleKHR"/>
- <command name="vkGetSemaphoreFuchsiaHandleKHR"/>
- </require>
- </extension>
<extension name="VK_KHR_magma_surface" number="1003" type="instance" requires="VK_KHR_surface" platform="fuchsia" contact="Craig Stout @cdotstout" supported="vulkan" author="KHR">
<require>
<enum value="1" name="VK_KHR_MAGMA_SURFACE_SPEC_VERSION"/>
