commit 1ccde92e5ecd2cef527dca5fbc36ba3dfbb56cd8
author Yilong Li <liyl@google.com> Thu Jan 19 23:25:09 2023 -0800
committer Yilong Li <liyl@google.com> Mon Jan 30 14:58:46 2023 -0800
tree b9b6e312493ffaba912b088fb42b013181efb8c6
parent 69088cfaf99f1bc671c3f5ac51dca77e756c8448

codegen: vulkan: Handle vkGetDeviceQueue2() correctly

This CL regenerates the VkEncoder code from aosp/2393626.

Original CL description:

  This adds handle creation info for vkQueue got from
  vkGetDeviceQueue2() (in encoder) and adds a custom
  global state decoder function for vkGetDeviceQueue2()
  (in decoder).

Bug: fxbug.dev/119990
Change-Id: Ic804d1ea4679a4156ce16a2c0d625c761c6d5278

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;
     ;