commit 1c607c7ccc56fa436fb7f3afa4c88b708ca9f29e
author Yilong Li <liyl@google.com> Wed Feb 23 13:17:06 2022 -0800
committer Yilong Li <liyl@google.com> Wed Feb 23 13:17:06 2022 -0800
tree 7c14f73a3edbb1c4531b4e5017186206f45b0157
parent dcaf0679e3da95e717348e7981171f03d005cc1a

ResourceTracker: Use vkGetLinearImageLayout2GOOGLE to check linear image layout.

This change replaces the old vkGetLinearImageLayoutGOOGLE() with
vkGetLinearImageLayout2GOOGLE() so that it could get the correct
linear image layout (offset / stride) from host Vulkan device.

Bug: fxbug.dev/94188
Change-Id: I4b8773f8bd44af2f6b5e562a28ca164276a8666d

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 32a849b..475b42e 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -2613,11 +2613,14 @@
         // Get row alignment from host GPU.
         VkDeviceSize offset;
         VkDeviceSize rowPitchAlignment;
-        enc->vkGetLinearImageLayoutGOOGLE(device, createInfo->format, &offset,
-                                          &rowPitchAlignment,
-                                          true /* do lock */);
+
+        VkImageCreateInfo createInfoDup = *createInfo;
+        createInfoDup.pNext = nullptr;
+        enc->vkGetLinearImageLayout2GOOGLE(device, &createInfoDup, &offset,
+                                           &rowPitchAlignment,
+                                           true /* do lock */);
         ALOGD(
-            "vkGetLinearImageLayoutGOOGLE: format %d offset %lu "
+            "vkGetLinearImageLayout2GOOGLE: format %d offset %lu "
             "rowPitchAlignment = %lu",
             (int)createInfo->format, offset, rowPitchAlignment);