commit 8e89eab7281def4353f52449edaf0278070bc696
author Lingfeng Yang <lfy@google.com> Sun Jan 06 16:16:53 2019 -0800
committer Lingfeng Yang <lfy@google.com> Sun Jan 06 19:53:06 2019 -0800
tree 20b82058b062127dbd90e14a4dffe750e5818525
parent abc80dabe9df4c106a134a07d105fbf7818a1bb9

Fix bug where encoder could become stale in host memory virt

Change-Id: Ia943959657ccb1db6f63aeaa606415dfe8793cfc

system/vulkan_enc/HostVisibleMemoryVirtualization.cpp

diff --git a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
index 883de3d..dba8356 100644
--- a/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
+++ b/system/vulkan_enc/HostVisibleMemoryVirtualization.cpp
@@ -189,7 +189,7 @@
 }
 
 VkResult finishHostMemAllocInit(
-    VkEncoder* enc,
+    VkEncoder*,
     VkDevice device,
     uint32_t memoryTypeIndex,
     VkDeviceSize nonCoherentAtomSize,
@@ -198,7 +198,6 @@
     uint8_t* mappedPtr,
     HostMemAlloc* out) {
 
-    out->enc = enc;
     out->device = device;
     out->memoryTypeIndex = memoryTypeIndex;
     out->nonCoherentAtomSize = nonCoherentAtomSize;
@@ -218,13 +217,14 @@
 }
 
 void destroyHostMemAlloc(
+    VkEncoder* enc,
     VkDevice device,
     HostMemAlloc* toDestroy) {
 
     if (toDestroy->initResult != VK_SUCCESS) return;
     if (!toDestroy->initialized) return;
 
-    toDestroy->enc->vkFreeMemory(device, toDestroy->memory, nullptr);
+    enc->vkFreeMemory(device, toDestroy->memory, nullptr);
     delete toDestroy->subAlloc;
 }