Remove custom magma memory import/export extension
Change-Id: I59e03ee19458ed76d860d85c8f9789d6fcc9af91
diff --git a/build-fuchsia/generated/include/parameter_validation.h b/build-fuchsia/generated/include/parameter_validation.h
index 3fd2751..4968268 100644
--- a/build-fuchsia/generated/include/parameter_validation.h
+++ b/build-fuchsia/generated/include/parameter_validation.h
@@ -6311,50 +6311,6 @@
-static bool parameter_validation_vkExportDeviceMemoryMAGMA(
- layer_data* layer_data,
- VkDeviceMemory memory,
- uint32_t* pHandle)
-{
- bool skipCall = false;
-
- if (!layer_data->extensions.vk_google_external_memory_magma) skipCall |= OutputExtensionError(layer_data, "vkExportDeviceMemoryMAGMA", VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME);
-
- skipCall |= validate_required_handle(layer_data->report_data, "vkExportDeviceMemoryMAGMA", "memory", memory);
-
- skipCall |= validate_required_pointer(layer_data->report_data, "vkExportDeviceMemoryMAGMA", "pHandle", pHandle, VALIDATION_ERROR_UNDEFINED);
-
- return skipCall;
-}
-
-static bool parameter_validation_vkImportDeviceMemoryMAGMA(
- layer_data* layer_data,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory)
-{
- UNUSED_PARAMETER(handle);
-
- bool skipCall = false;
-
- if (!layer_data->extensions.vk_google_external_memory_magma) skipCall |= OutputExtensionError(layer_data, "vkImportDeviceMemoryMAGMA", VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME);
-
- if (pAllocator != NULL)
- {
- skipCall |= validate_required_pointer(layer_data->report_data, "vkImportDeviceMemoryMAGMA", "pAllocator->pfnAllocation", reinterpret_cast<const void*>(pAllocator->pfnAllocation), VALIDATION_ERROR_002004f0);
-
- skipCall |= validate_required_pointer(layer_data->report_data, "vkImportDeviceMemoryMAGMA", "pAllocator->pfnReallocation", reinterpret_cast<const void*>(pAllocator->pfnReallocation), VALIDATION_ERROR_002004f2);
-
- skipCall |= validate_required_pointer(layer_data->report_data, "vkImportDeviceMemoryMAGMA", "pAllocator->pfnFree", reinterpret_cast<const void*>(pAllocator->pfnFree), VALIDATION_ERROR_002004f4);
- }
-
- skipCall |= validate_required_pointer(layer_data->report_data, "vkImportDeviceMemoryMAGMA", "pMemory", pMemory, VALIDATION_ERROR_UNDEFINED);
-
- return skipCall;
-}
-
-
-
@@ -7580,15 +7536,6 @@
const VkAllocationCallbacks* pAllocator,
VkSurfaceKHR* pSurface);
#endif
-VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(
- VkDevice device,
- VkDeviceMemory memory,
- uint32_t* pHandle);
-VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(
- VkDevice device,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory);
// Map of all APIs to be intercepted by this layer
static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
{"vkCreateInstance", (void*)CreateInstance},
@@ -7890,8 +7837,6 @@
#ifdef VK_USE_PLATFORM_MACOS_MVK
{"vkCreateMacOSSurfaceMVK", (void*)CreateMacOSSurfaceMVK},
#endif
- {"vkExportDeviceMemoryMAGMA", (void*)ExportDeviceMemoryMAGMA},
- {"vkImportDeviceMemoryMAGMA", (void*)ImportDeviceMemoryMAGMA},
};
diff --git a/build-fuchsia/generated/include/thread_check.h b/build-fuchsia/generated/include/thread_check.h
index 8232ce1..b57be9c 100644
--- a/build-fuchsia/generated/include/thread_check.h
+++ b/build-fuchsia/generated/include/thread_check.h
@@ -5228,54 +5228,6 @@
-VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(
- VkDevice device,
- VkDeviceMemory memory,
- uint32_t* pHandle)
-{
- 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);
- startReadObject(my_data, memory);
- }
- result = pTable->ExportDeviceMemoryMAGMA(device,memory,pHandle);
- if (threadChecks) {
- finishReadObject(my_data, device);
- finishReadObject(my_data, memory);
- } else {
- finishMultiThread();
- }
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(
- VkDevice device,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory)
-{
- 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->ImportDeviceMemoryMAGMA(device,handle,pAllocator,pMemory);
- if (threadChecks) {
- finishReadObject(my_data, device);
- } else {
- finishMultiThread();
- }
- return result;
-}
-
-
// Map of all APIs to be intercepted by this layer
static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
{"vkCreateInstance", (void*)CreateInstance},
@@ -5531,8 +5483,6 @@
#ifdef VK_USE_PLATFORM_MACOS_MVK
{"vkCreateMacOSSurfaceMVK", (void*)CreateMacOSSurfaceMVK},
#endif
- {"vkExportDeviceMemoryMAGMA", (void*)ExportDeviceMemoryMAGMA},
- {"vkImportDeviceMemoryMAGMA", (void*)ImportDeviceMemoryMAGMA},
};
diff --git a/build-fuchsia/generated/include/unique_objects_wrappers.h b/build-fuchsia/generated/include/unique_objects_wrappers.h
index 3eb857b..5351624 100644
--- a/build-fuchsia/generated/include/unique_objects_wrappers.h
+++ b/build-fuchsia/generated/include/unique_objects_wrappers.h
@@ -3638,36 +3638,6 @@
}
#endif // VK_USE_PLATFORM_MACOS_MVK
-VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(
- VkDevice device,
- VkDeviceMemory memory,
- uint32_t* pHandle)
-{
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- {
- std::lock_guard<std::mutex> lock(global_lock);
- memory = Unwrap(dev_data, memory);
- }
- VkResult result = dev_data->dispatch_table.ExportDeviceMemoryMAGMA(device, memory, pHandle);
-
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(
- VkDevice device,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory)
-{
- layer_data *dev_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- VkResult result = dev_data->dispatch_table.ImportDeviceMemoryMAGMA(device, handle, pAllocator, pMemory);
- if (VK_SUCCESS == result) {
- std::lock_guard<std::mutex> lock(global_lock);
- *pMemory = WrapNew(dev_data, *pMemory);
- }
- return result;
-}
-
// Layer Device Extension Whitelist
static const char *kUniqueObjectsSupportedDeviceExtensions =
"VK_KHR_swapchain"
@@ -3749,7 +3719,6 @@
"VK_NV_framebuffer_mixed_samples"
"VK_NV_fill_rectangle"
"VK_EXT_post_depth_coverage"
-"VK_GOOGLE_external_memory_magma"
;
@@ -4028,8 +3997,6 @@
#ifdef VK_USE_PLATFORM_MACOS_MVK
{"vkCreateMacOSSurfaceMVK", (void*)CreateMacOSSurfaceMVK},
#endif
- {"vkExportDeviceMemoryMAGMA", (void*)ExportDeviceMemoryMAGMA},
- {"vkImportDeviceMemoryMAGMA", (void*)ImportDeviceMemoryMAGMA},
};
diff --git a/build-fuchsia/generated/include/vk_dispatch_table_helper.h b/build-fuchsia/generated/include/vk_dispatch_table_helper.h
index fadd2bb..4cc0585 100644
--- a/build-fuchsia/generated/include/vk_dispatch_table_helper.h
+++ b/build-fuchsia/generated/include/vk_dispatch_table_helper.h
@@ -233,8 +233,6 @@
table->GetPastPresentationTimingGOOGLE = (PFN_vkGetPastPresentationTimingGOOGLE) gpa(device, "vkGetPastPresentationTimingGOOGLE");
table->CmdSetDiscardRectangleEXT = (PFN_vkCmdSetDiscardRectangleEXT) gpa(device, "vkCmdSetDiscardRectangleEXT");
table->SetHdrMetadataEXT = (PFN_vkSetHdrMetadataEXT) gpa(device, "vkSetHdrMetadataEXT");
- table->ExportDeviceMemoryMAGMA = (PFN_vkExportDeviceMemoryMAGMA) gpa(device, "vkExportDeviceMemoryMAGMA");
- table->ImportDeviceMemoryMAGMA = (PFN_vkImportDeviceMemoryMAGMA) gpa(device, "vkImportDeviceMemoryMAGMA");
}
diff --git a/build-fuchsia/generated/include/vk_extension_helper.h b/build-fuchsia/generated/include/vk_extension_helper.h
index 0ceac85..bb259b0 100644
--- a/build-fuchsia/generated/include/vk_extension_helper.h
+++ b/build-fuchsia/generated/include/vk_extension_helper.h
@@ -153,7 +153,6 @@
bool vk_ext_post_depth_coverage{false};
bool vk_nv_fill_rectangle{false};
bool vk_amd_shader_trinary_minmax{false};
- bool vk_google_external_memory_magma{false};
bool vk_khr_external_semaphore_fd{false};
bool vk_img_format_pvrtc{false};
bool vk_nv_glsl_shader{false};
@@ -230,7 +229,6 @@
{VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME, &DeviceExtensions::vk_ext_post_depth_coverage},
{VK_NV_FILL_RECTANGLE_EXTENSION_NAME, &DeviceExtensions::vk_nv_fill_rectangle},
{VK_AMD_SHADER_TRINARY_MINMAX_EXTENSION_NAME, &DeviceExtensions::vk_amd_shader_trinary_minmax},
- {VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME, &DeviceExtensions::vk_google_external_memory_magma},
{VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, &DeviceExtensions::vk_khr_external_semaphore_fd},
{VK_IMG_FORMAT_PVRTC_EXTENSION_NAME, &DeviceExtensions::vk_img_format_pvrtc},
{VK_NV_GLSL_SHADER_EXTENSION_NAME, &DeviceExtensions::vk_nv_glsl_shader},
diff --git a/build-fuchsia/generated/include/vk_layer_dispatch_table.h b/build-fuchsia/generated/include/vk_layer_dispatch_table.h
index 2c26ac3..b97b581 100644
--- a/build-fuchsia/generated/include/vk_layer_dispatch_table.h
+++ b/build-fuchsia/generated/include/vk_layer_dispatch_table.h
@@ -441,10 +441,6 @@
// ---- VK_EXT_hdr_metadata extension commands
PFN_vkSetHdrMetadataEXT SetHdrMetadataEXT;
-
- // ---- VK_GOOGLE_external_memory_magma extension commands
- PFN_vkExportDeviceMemoryMAGMA ExportDeviceMemoryMAGMA;
- PFN_vkImportDeviceMemoryMAGMA ImportDeviceMemoryMAGMA;
} VkLayerDispatchTable;
diff --git a/build-fuchsia/generated/include/vk_loader_extensions.c b/build-fuchsia/generated/include/vk_loader_extensions.c
index 3dc46aa..dc3c87e 100644
--- a/build-fuchsia/generated/include/vk_loader_extensions.c
+++ b/build-fuchsia/generated/include/vk_loader_extensions.c
@@ -491,10 +491,6 @@
// ---- VK_EXT_hdr_metadata extension commands
table->SetHdrMetadataEXT = (PFN_vkSetHdrMetadataEXT)gpa(dev, "vkSetHdrMetadataEXT");
-
- // ---- VK_GOOGLE_external_memory_magma extension commands
- table->ExportDeviceMemoryMAGMA = (PFN_vkExportDeviceMemoryMAGMA)gpa(dev, "vkExportDeviceMemoryMAGMA");
- table->ImportDeviceMemoryMAGMA = (PFN_vkImportDeviceMemoryMAGMA)gpa(dev, "vkImportDeviceMemoryMAGMA");
}
// Init Instance function pointer dispatch table with core commands
@@ -916,10 +912,6 @@
// ---- VK_EXT_hdr_metadata extension commands
if (!strcmp(name, "SetHdrMetadataEXT")) return (void *)table->SetHdrMetadataEXT;
- // ---- VK_GOOGLE_external_memory_magma extension commands
- if (!strcmp(name, "ExportDeviceMemoryMAGMA")) return (void *)table->ExportDeviceMemoryMAGMA;
- if (!strcmp(name, "ImportDeviceMemoryMAGMA")) return (void *)table->ImportDeviceMemoryMAGMA;
-
return NULL;
}
@@ -1874,26 +1866,6 @@
}
#endif // VK_USE_PLATFORM_MACOS_MVK
-
-// ---- VK_GOOGLE_external_memory_magma extension trampoline/terminators
-
-VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(
- VkDevice device,
- VkDeviceMemory memory,
- uint32_t* pHandle) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->ExportDeviceMemoryMAGMA(device, memory, pHandle);
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(
- VkDevice device,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory) {
- const VkLayerDispatchTable *disp = loader_get_dispatch(device);
- return disp->ImportDeviceMemoryMAGMA(device, handle, pAllocator, pMemory);
-}
-
// GPA helpers for extensions
bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *name, void **addr) {
*addr = NULL;
@@ -2364,16 +2336,6 @@
return true;
}
#endif // VK_USE_PLATFORM_MACOS_MVK
-
- // ---- VK_GOOGLE_external_memory_magma extension commands
- if (!strcmp("vkExportDeviceMemoryMAGMA", name)) {
- *addr = (void *)ExportDeviceMemoryMAGMA;
- return true;
- }
- if (!strcmp("vkImportDeviceMemoryMAGMA", name)) {
- *addr = (void *)ImportDeviceMemoryMAGMA;
- return true;
- }
return false;
}
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 9cd57e9..42d6755 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -6557,26 +6557,6 @@
#define VK_EXT_POST_DEPTH_COVERAGE_EXTENSION_NAME "VK_EXT_post_depth_coverage"
-#define VK_GOOGLE_external_memory_magma 1
-#define VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_SPEC_VERSION 1
-#define VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME "VK_GOOGLE_external_memory_magma"
-
-typedef VkResult (VKAPI_PTR *PFN_vkExportDeviceMemoryMAGMA)(VkDevice device, VkDeviceMemory memory, uint32_t* pHandle);
-typedef VkResult (VKAPI_PTR *PFN_vkImportDeviceMemoryMAGMA)(VkDevice device, uint32_t handle, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory);
-
-#ifndef VK_NO_PROTOTYPES
-VKAPI_ATTR VkResult VKAPI_CALL vkExportDeviceMemoryMAGMA(
- VkDevice device,
- VkDeviceMemory memory,
- uint32_t* pHandle);
-
-VKAPI_ATTR VkResult VKAPI_CALL vkImportDeviceMemoryMAGMA(
- VkDevice device,
- uint32_t handle,
- const VkAllocationCallbacks* pAllocator,
- VkDeviceMemory* pMemory);
-#endif
-
#define VK_GOOGLE_image_usage_scanout 1
#define VK_GOOGLE_IMAGE_USAGE_SCANOUT_SPEC_VERSION 1
#define VK_GOOGLE_IMAGE_USAGE_SCANOUT_EXTENSION_NAME "VK_GOOGLE_image_usage_scanout"
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index 45377a5..bf641f0 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -26000,16 +26000,6 @@
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
- Result exportMemoryMAGMA( DeviceMemory memory, uint32_t* pHandle ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- ResultValueType<uint32_t>::type exportMemoryMAGMA( DeviceMemory memory ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
- Result importMemoryMAGMA( uint32_t handle, const AllocationCallbacks* pAllocator, DeviceMemory* pMemory ) const;
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- ResultValueType<DeviceMemory>::type importMemoryMAGMA( uint32_t handle, Optional<const AllocationCallbacks> allocator = nullptr ) const;
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
Result createIndirectCommandsLayoutNVX( const IndirectCommandsLayoutCreateInfoNVX* pCreateInfo, const AllocationCallbacks* pAllocator, IndirectCommandsLayoutNVX* pIndirectCommandsLayout ) const;
#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
ResultValueType<IndirectCommandsLayoutNVX>::type createIndirectCommandsLayoutNVX( const IndirectCommandsLayoutCreateInfoNVX & createInfo, Optional<const AllocationCallbacks> allocator = nullptr ) const;
@@ -27963,32 +27953,6 @@
#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
#endif /*VK_USE_PLATFORM_WIN32_KHR*/
- VULKAN_HPP_INLINE Result Device::exportMemoryMAGMA( DeviceMemory memory, uint32_t* pHandle ) const
- {
- return static_cast<Result>( vkExportDeviceMemoryMAGMA( m_device, static_cast<VkDeviceMemory>( memory ), pHandle ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- VULKAN_HPP_INLINE ResultValueType<uint32_t>::type Device::exportMemoryMAGMA( DeviceMemory memory ) const
- {
- uint32_t handle;
- Result result = static_cast<Result>( vkExportDeviceMemoryMAGMA( m_device, static_cast<VkDeviceMemory>( memory ), &handle ) );
- return createResultValue( result, handle, "vk::Device::exportMemoryMAGMA" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
- VULKAN_HPP_INLINE Result Device::importMemoryMAGMA( uint32_t handle, const AllocationCallbacks* pAllocator, DeviceMemory* pMemory ) const
- {
- return static_cast<Result>( vkImportDeviceMemoryMAGMA( m_device, handle, reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ), reinterpret_cast<VkDeviceMemory*>( pMemory ) ) );
- }
-#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE
- VULKAN_HPP_INLINE ResultValueType<DeviceMemory>::type Device::importMemoryMAGMA( uint32_t handle, Optional<const AllocationCallbacks> allocator ) const
- {
- DeviceMemory memory;
- Result result = static_cast<Result>( vkImportDeviceMemoryMAGMA( m_device, handle, reinterpret_cast<const VkAllocationCallbacks*>( static_cast<const AllocationCallbacks*>( allocator ) ), reinterpret_cast<VkDeviceMemory*>( &memory ) ) );
- return createResultValue( result, memory, "vk::Device::importMemoryMAGMA" );
- }
-#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
-
VULKAN_HPP_INLINE Result Device::createIndirectCommandsLayoutNVX( const IndirectCommandsLayoutCreateInfoNVX* pCreateInfo, const AllocationCallbacks* pAllocator, IndirectCommandsLayoutNVX* pIndirectCommandsLayout ) const
{
return static_cast<Result>( vkCreateIndirectCommandsLayoutNVX( m_device, reinterpret_cast<const VkIndirectCommandsLayoutCreateInfoNVX*>( pCreateInfo ), reinterpret_cast<const VkAllocationCallbacks*>( pAllocator ), reinterpret_cast<VkIndirectCommandsLayoutNVX*>( pIndirectCommandsLayout ) ) );
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp
index 9dc9a9b..1ea76c0 100644
--- a/layers/parameter_validation.cpp
+++ b/layers/parameter_validation.cpp
@@ -4945,38 +4945,6 @@
return true;
}
-#ifdef VK_USE_PLATFORM_MAGMA_KHR
-VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(VkDevice device, VkDeviceMemory memory, uint32_t* pHandle) {
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- bool skip = false;
- layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- assert(my_data != NULL);
-
- skip |= parameter_validation_vkExportDeviceMemoryMAGMA(my_data, memory, pHandle);
-
- if (!skip) {
- result = my_data->dispatch_table.ExportDeviceMemoryMAGMA(device, memory, pHandle);
- }
-
- return result;
-}
-
-VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(VkDevice device, uint32_t handle, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory) {
- VkResult result = VK_ERROR_VALIDATION_FAILED_EXT;
- bool skip = false;
- layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
- assert(my_data != NULL);
-
- skip |= parameter_validation_vkImportDeviceMemoryMAGMA(my_data, handle, pAllocator, pMemory);
-
- if (!skip) {
- result = my_data->dispatch_table.ImportDeviceMemoryMAGMA(device, handle, pAllocator, pMemory);
- }
-
- return result;
-}
-#endif // VK_USE_PLATFORM_MAGMA_KHR
-
VKAPI_ATTR void VKAPI_CALL GetPhysicalDeviceSparseImageFormatProperties2KHR(
VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2KHR *pFormatInfo, uint32_t *pPropertyCount,
VkSparseImageFormatProperties2KHR *pProperties) {
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 9c18213..367d3f1 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1945,24 +1945,3 @@
disp->CmdExecuteCommands(commandBuffer, commandBuffersCount, pCommandBuffers);
}
-
-#ifdef VK_USE_PLATFORM_MAGMA_KHR
-
-LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkExportDeviceMemoryMAGMA(VkDevice device, VkDeviceMemory memory, uint32_t* pHandle) {
- const VkLayerDispatchTable *disp;
-
- disp = loader_get_dispatch(device);
-
- return disp->ExportDeviceMemoryMAGMA(device, memory, pHandle);
-}
-
-LOADER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkImportDeviceMemoryMAGMA(VkDevice device, uint32_t handle,
- const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMemory) {
- const VkLayerDispatchTable *disp;
-
- disp = loader_get_dispatch(device);
-
- return disp->ImportDeviceMemoryMAGMA(device, handle, pAllocator, pMemory);
-}
-
-#endif // VK_USE_PLATFORM_MAGMA_KHR
diff --git a/scripts/vk.xml b/scripts/vk.xml
index 35c49ab..2ed41aa 100644
--- a/scripts/vk.xml
+++ b/scripts/vk.xml
@@ -4741,19 +4741,6 @@
<param><type>VkExternalMemoryHandleTypeFlagsNV</type> <name>handleType</name></param>
<param><type>HANDLE</type>* <name>pHandle</name></param>
</command>
- <command successcodes="VK_SUCCESS" errorcodes="VK_ERROR_OUT_OF_HOST_MEMORY">
- <proto><type>VkResult</type> <name>vkExportDeviceMemoryMAGMA</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param><type>VkDeviceMemory</type> <name>memory</name></param>
- <param><type>uint32_t</type>* <name>pHandle</name></param>
- </command>
- <command successcodes="VK_SUCCESS" errorcodes="">
- <proto><type>VkResult</type> <name>vkImportDeviceMemoryMAGMA</name></proto>
- <param><type>VkDevice</type> <name>device</name></param>
- <param><type>uint32_t</type> <name>handle</name></param>
- <param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
- <param><type>VkDeviceMemory</type>* <name>pMemory</name></param>
- </command>
<command queues="graphics" renderpass="inside" cmdbufferlevel="primary,secondary" pipeline="graphics">
<proto><type>void</type> <name>vkCmdDrawIndirectCountAMD</name></proto>
<param externsync="true"><type>VkCommandBuffer</type> <name>commandBuffer</name></param>
@@ -5960,14 +5947,6 @@
<command name="vkGetMemoryWin32HandleNV"/>
</require>
</extension>
- <extension name="VK_GOOGLE_external_memory_magma" number="258" type="device" supported="vulkan">
- <require>
- <enum value="1" name="VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_SPEC_VERSION"/>
- <enum value=""VK_GOOGLE_external_memory_magma"" name="VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME"/>
- <command name="vkExportDeviceMemoryMAGMA"/>
- <command name="vkImportDeviceMemoryMAGMA"/>
- </require>
- </extension>
<extension name="VK_NV_win32_keyed_mutex" number="59" type="device" requires="VK_NV_external_memory_capabilities,VK_NV_external_memory_win32" author="NV" contact="Carsten Rohde" protect="VK_USE_PLATFORM_WIN32_KHR" supported="vulkan">
<require>
<enum value="1" name="VK_NV_WIN32_KEYED_MUTEX_SPEC_VERSION"/>
diff --git a/scripts/vuid_mapping.py b/scripts/vuid_mapping.py
index 39c960c..5f15f36 100644
--- a/scripts/vuid_mapping.py
+++ b/scripts/vuid_mapping.py
@@ -542,17 +542,15 @@
'VkPhysicalDeviceVariablePointerFeaturesKHR' : 486,
'VkMagmaSurfaceCreateInfoKHR' : 487,
'vkCreateMagmaSurfaceKHR' : 488,
-'vkExportDeviceMemoryMAGMA' : 489,
-'vkImportDeviceMemoryMAGMA' : 490,
-'VkImportMemoryFuchsiaHandleInfoKHR' : 491,
-'VkMemoryFuchsiaHandlePropertiesKHR' : 492,
-'VkMemoryGetFuchsiaHandleInfoKHR' : 493,
-'vkGetMemoryFuchsiaHandleKHR' : 494,
-'vkGetMemoryFuchsiaHandlePropertiesKHR': 495,
-'VkImportSemaphoreFuchsiaHandleInfoKHR' : 496,
-'vkImportSemaphoreFuchsiaHandleKHR' : 497,
-'VkSemaphoreGetFuchsiaHandleInfoKHR' : 498,
-'vkGetSemaphoreFuchsiaHandleKHR' : 499,
+'VkImportMemoryFuchsiaHandleInfoKHR' : 489,
+'VkMemoryFuchsiaHandlePropertiesKHR' : 490,
+'VkMemoryGetFuchsiaHandleInfoKHR' : 491,
+'vkGetMemoryFuchsiaHandleKHR' : 492,
+'vkGetMemoryFuchsiaHandlePropertiesKHR': 493,
+'VkImportSemaphoreFuchsiaHandleInfoKHR' : 494,
+'vkImportSemaphoreFuchsiaHandleKHR' : 495,
+'VkSemaphoreGetFuchsiaHandleInfoKHR' : 496,
+'vkGetSemaphoreFuchsiaHandleKHR' : 497,
### ADD New func/struct mappings above this line
}
# Mapping of params to unique IDs
