commit 66e397bbba070734241df91ae7570bdfadc820ea
author Jason Macnak <natsu@google.com> Wed Mar 15 12:11:22 2023 -0700
committer Jason Macnak <natsu@google.com> Wed Apr 05 10:28:17 2023 -0700
tree 55c86e6409b993556a658c2cc78a9fa8934ba358
parent 25f00947bf1061e23bff634f2872e37584e586b4

Ensure AHBs use the reserved emulated memory type index

... so that the guest never tries to map AHB memory.

Bug: b/272079201
Test: cts -m CtsNativeHardwareTestCases
Test: cts -m CtsDeqpTestCases --module-arg
      CtsDeqpTestCases:include-filter:dEQP-VK.api.external.memory.android_hardware_buffer*
Change-Id: I0b8030bdfdcedc5429191a3e76c9ff6355e9acbf

system/vulkan_enc/AndroidHardwareBuffer.h

diff --git a/system/vulkan_enc/AndroidHardwareBuffer.h b/system/vulkan_enc/AndroidHardwareBuffer.h
index 9c9cb94..cab626b 100644
--- a/system/vulkan_enc/AndroidHardwareBuffer.h
+++ b/system/vulkan_enc/AndroidHardwareBuffer.h
@@ -32,10 +32,11 @@
     const VkImageCreateFlags vk_create,
     const VkImageUsageFlags vk_usage);
 
+void updateMemoryTypeBitsForAndroidHardwareBuffers(
+    uint32_t* memoryTypeBits);
+
 VkResult getAndroidHardwareBufferPropertiesANDROID(
     Gralloc* grallocHelper,
-    const VkPhysicalDeviceMemoryProperties* memProps,
-    VkDevice,
     const AHardwareBuffer* buffer,
     VkAndroidHardwareBufferPropertiesANDROID* pProperties);