commit e997952ed78636ae8bfd543c58479b8784f22bc1
author Lingfeng Yang <lfy@google.com> Tue Dec 25 14:44:52 2018 -0800
committer Lingfeng Yang <lfy@google.com> Tue Dec 25 17:15:44 2018 -0800
tree dfbcb80b082d3e5cc8e9c4c62d978b1cd42d677a
parent df173138091f6b41393ff972739bb701e2f4521e

[vulkan] Promote vkAllocate/FreeMemory to fully virtual entry points

bug: 111137294
bug: 121420031
Change-Id: Id85c246a3b853d035934cb1803be8fe825777a73

system/vulkan/func_table.cpp

diff --git a/system/vulkan/func_table.cpp b/system/vulkan/func_table.cpp
index 724190e..44faf95 100644
--- a/system/vulkan/func_table.cpp
+++ b/system/vulkan/func_table.cpp
@@ -27,6 +27,7 @@
 
 #include "VkEncoder.h"
 #include "HostConnection.h"
+#include "ResourceTracker.h"
 
 #include "goldfish_vk_private_defs.h"
 
@@ -239,7 +240,8 @@
 {
     auto vkEnc = HostConnection::get()->vkEncoder();
     VkResult vkAllocateMemory_VkResult_return = (VkResult)0;
-    vkAllocateMemory_VkResult_return = vkEnc->vkAllocateMemory(device, pAllocateInfo, pAllocator, pMemory);
+    auto resources = ResourceTracker::get();
+    vkAllocateMemory_VkResult_return = resources->on_vkAllocateMemory(vkEnc, VK_SUCCESS, device, pAllocateInfo, pAllocator, pMemory);
     return vkAllocateMemory_VkResult_return;
 }
 static void entry_vkFreeMemory(
@@ -248,7 +250,8 @@
     const VkAllocationCallbacks* pAllocator)
 {
     auto vkEnc = HostConnection::get()->vkEncoder();
-    vkEnc->vkFreeMemory(device, memory, pAllocator);
+    auto resources = ResourceTracker::get();
+    resources->on_vkFreeMemory(vkEnc, device, memory, pAllocator);
 }
 static VkResult entry_vkMapMemory(
     VkDevice device,