commit e637ca5bfef9f31b559c3fb040725d8b61cdaf5f
author Lingfeng Yang <lfy@google.com> Fri Dec 14 18:24:56 2018 -0800
committer Lingfeng Yang <lfy@google.com> Mon Dec 17 10:46:58 2018 -0800
tree 9a9743cb1b68b2757aaaaf7afe9f9302f7541cb0
parent def88ba65d2f8768e2e6979f81766c7a23a4f607

[vulkan] Fix error in ColorBuffer handle extraction

bug: 111137294
bug: 119426975

We should pull the local colorbuffer handle from the pNext
field of the local copy, not just the local copy itself.

Change-Id: I3aa4a3b2d2bd8788fa6183302b095112e62e11cc

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 2a572fe..3738839 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -372,7 +372,9 @@
         if (!cb_handle) return;
 
         VkNativeBufferANDROID* nativeInfoOut =
-            reinterpret_cast<VkNativeBufferANDROID*>(local_pCreateInfo);
+            reinterpret_cast<VkNativeBufferANDROID*>(
+                const_cast<void*>(
+                    local_pCreateInfo->pNext));
 
         if (!nativeInfoOut->handle) {
             ALOGE("FATAL: Local native buffer info not properly allocated!");