commit bcfe963c5a20c1a633f730d9e4979d6d5af0cfea
author Jason Macnak <natsu@google.com> Wed Feb 22 18:44:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 22 18:44:05 2023 +0000
tree 052e159972e9f0156b73005f77a63ae024d7ae9b
parent a527383a731e035f2f8d88664fc3ee5f6b8bfe41

Revert "Always pass through VkMemoryDedicatedAllocateInfo to host"

Revert submission 2442579-revert-2383058-revert-2318952-JRCOFEFCOJ-MCGBSQEWLC

Reason for revert: Media failures b/270230549

Reverted changes: /q/submissionid:2442579-revert-2383058-revert-2318952-JRCOFEFCOJ-MCGBSQEWLC

Change-Id: Ib1bbbd0a0ce773face95beba6845c5cdd692593b

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 195cb16..aebcdc0 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -3188,20 +3188,8 @@
         const VkMemoryDedicatedAllocateInfo* dedicatedAllocInfoPtr =
             vk_find_struct<VkMemoryDedicatedAllocateInfo>(pAllocateInfo);
 
-        // Note for AHardwareBuffers, the Vulkan spec states:
-        //
-        //     Android hardware buffers have intrinsic width, height, format, and usage
-        //     properties, so Vulkan images bound to memory imported from an Android
-        //     hardware buffer must use dedicated allocations
-        //
-        // so any allocation requests with a VkImportAndroidHardwareBufferInfoANDROID
-        // will necessarily have a VkMemoryDedicatedAllocateInfo. However, the host
-        // may or may not actually use a dedicated allocation to emulate
-        // AHardwareBuffers. As such, the VkMemoryDedicatedAllocateInfo is passed to the
-        // host and the host will decide whether or not to use it.
-
         bool shouldPassThroughDedicatedAllocInfo =
-            !exportAllocateInfoPtr &&
+            !exportAllocateInfoPtr && !importAhbInfoPtr &&
             !importBufferCollectionInfoPtr &&
             !importVmoInfoPtr;