commit 382f3e164656b1599cb955dc96cbc13b5d7ca84c
author Yilong Li <liyl@google.com> Tue Jan 31 09:10:35 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 31 09:10:35 2023 +0000
tree b9b6e312493ffaba912b088fb42b013181efb8c6
parent 7e1d3aa8864618804bf000bff9572ca16091f964
parent 1ccde92e5ecd2cef527dca5fbc36ba3dfbb56cd8

codegen: vulkan: Handle vkGetDeviceQueue2() correctly am: 1ccde92e5e

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2394634

Change-Id: I22f33bcc879f65ab1a6b2b790418bbbcf1529513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

system/vulkan_enc/VkEncoder.cpp

diff --git a/system/vulkan_enc/VkEncoder.cpp b/system/vulkan_enc/VkEncoder.cpp
index 28fa33b..5d96705 100644
--- a/system/vulkan_enc/VkEncoder.cpp
+++ b/system/vulkan_enc/VkEncoder.cpp
@@ -18605,9 +18605,11 @@
         healthMonitorAnnotation_packetContents.resize(watchdogBufSize);
         memcpy(&healthMonitorAnnotation_packetContents[0], packetBeginPtr, watchdogBufSize);
     }
+    stream->setHandleMapping(sResourceTracker->createMapping());
     uint64_t cgen_var_2;
     stream->read((uint64_t*)&cgen_var_2, 8);
     stream->handleMapping()->mapHandles_u64_VkQueue(&cgen_var_2, (VkQueue*)pQueue, 1);
+    stream->unsetHandleMapping();
     sResourceTracker->on_vkGetDeviceQueue2(this, device, pQueueInfo, pQueue);
     ++encodeCount;
     ;