commit 1e6a9db443929b6b19085350bda1a0825aa54036
author Forrest Reiling <freiling@google.com> Tue Apr 11 14:30:43 2017 -0700
committer Forrest Reiling <freiling@google.com> Wed Apr 12 16:05:50 2017 -0700
tree bcc4dc71b5fb555632dd36a519b57881bbb25163
parent 925953ae1ae51e3ee0ce5ac4cda5a2de4424ba0a

add support for ImportDeviceMemoryMAGMA and ExportDeviceMemoryMAGMA memory to object tracking layer

Change-Id: I962686e77c6f5523d181fb5c6d0cd100a1e35d9e

layers/object_tracker.cpp

diff --git a/layers/object_tracker.cpp b/layers/object_tracker.cpp
index c509414..81306b6 100644
--- a/layers/object_tracker.cpp
+++ b/layers/object_tracker.cpp
@@ -665,6 +665,39 @@
     return result;
 }
 
+VKAPI_ATTR VkResult VKAPI_CALL ImportDeviceMemoryMAGMA(VkDevice device, uint32_t handle, const VkAllocationCallbacks *pAllocator,
+                                                       VkDeviceMemory *pMemory) {
+    bool skip_call = false;
+    {
+        std::lock_guard<std::mutex> lock(global_lock);
+        skip_call |= ValidateObject(device, device, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, false, VALIDATION_ERROR_00612);
+    }
+    if (skip_call) {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+    VkResult result = get_dispatch_table(ot_device_table_map, device)->ImportDeviceMemoryMAGMA(device, handle, pAllocator, pMemory);
+    {
+        std::lock_guard<std::mutex> lock(global_lock);
+        if (result == VK_SUCCESS) {
+            CreateObject(device, *pMemory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, pAllocator);
+        }
+    }
+    return result;
+}
+
+VKAPI_ATTR VkResult VKAPI_CALL ExportDeviceMemoryMAGMA(VkDevice device, VkDeviceMemory memory, uint32_t *pHandle) {
+    bool skip_call = false;
+    std::unique_lock<std::mutex> lock(global_lock);
+    skip_call |= ValidateObject(device, device, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT, false, VALIDATION_ERROR_00621);
+    skip_call |= ValidateObject(device, memory, VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, true, VALIDATION_ERROR_00622);
+    lock.unlock();
+    if (skip_call) {
+        return VK_ERROR_VALIDATION_FAILED_EXT;
+    }
+
+    return get_dispatch_table(ot_device_table_map, device)->ExportDeviceMemoryMAGMA(device, memory, pHandle);
+}
+
 VKAPI_ATTR VkResult VKAPI_CALL FlushMappedMemoryRanges(VkDevice device, uint32_t memoryRangeCount,
                                                        const VkMappedMemoryRange *pMemoryRanges) {
     bool skip_call = false;
@@ -4049,6 +4082,10 @@
         return (PFN_vkVoidFunction)DeviceWaitIdle;
     if (!strcmp(name, "AllocateMemory"))
         return (PFN_vkVoidFunction)AllocateMemory;
+    if (!strcmp(name, "ImportDeviceMemoryMAGMA"))
+        return (PFN_vkVoidFunction)ImportDeviceMemoryMAGMA;
+    if (!strcmp(name, "ExportDeviceMemoryMAGMA"))
+        return (PFN_vkVoidFunction)ExportDeviceMemoryMAGMA;
     if (!strcmp(name, "FreeMemory"))
         return (PFN_vkVoidFunction)FreeMemory;
     if (!strcmp(name, "MapMemory"))