vulkan: Filter out external memory flags based on guest system.
Android guests don't support Zircon handle types as external memory,
and Fuchsia guests don't support AHB/opaque fds either. When guests
receive the VkExternalMemoryProperties from host, they should filter
out all the external memory formats they don't support.
This is part of fix to vkext_unprotected tests on FEMU.
Bug: fuchsia:60064
Change-Id: I6f7b47191ab80aa1383fe99c6366522a758b6fa0
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 8a18b23..cfd139b 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1128,6 +1128,25 @@
}
}
+ void transformImpl_VkExternalMemoryProperties_fromhost(
+ VkExternalMemoryProperties* pProperties,
+ uint32_t) {
+ VkExternalMemoryHandleTypeFlags supportedHandleType = 0u;
+#ifdef VK_USE_PLATFORM_FUCHSIA
+ supportedHandleType |=
+ VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA;
+#endif // VK_USE_PLATFORM_FUCHSIA
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+ supportedHandleType |=
+ VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT |
+ VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
+#endif // VK_USE_PLATFORM_ANDROID_KHR
+ if (supportedHandleType) {
+ pProperties->compatibleHandleTypes &= supportedHandleType;
+ pProperties->exportFromImportedHandleTypes &= supportedHandleType;
+ }
+ }
+
VkResult on_vkEnumerateInstanceExtensionProperties(
void* context,
VkResult,
@@ -7180,9 +7199,19 @@
typeBits, typeBitsCount);
}
-#define DEFINE_TRANSFORMED_TYPE_IMPL(type) \
- void ResourceTracker::transformImpl_##type##_tohost(const type*, uint32_t) { } \
- void ResourceTracker::transformImpl_##type##_fromhost(const type*, uint32_t) { } \
+void ResourceTracker::transformImpl_VkExternalMemoryProperties_fromhost(
+ VkExternalMemoryProperties* pProperties,
+ uint32_t lenAccess) {
+ mImpl->transformImpl_VkExternalMemoryProperties_fromhost(pProperties,
+ lenAccess);
+}
+
+void ResourceTracker::transformImpl_VkExternalMemoryProperties_tohost(
+ VkExternalMemoryProperties*, uint32_t) {}
+
+#define DEFINE_TRANSFORMED_TYPE_IMPL(type) \
+ void ResourceTracker::transformImpl_##type##_tohost(type*, uint32_t) {} \
+ void ResourceTracker::transformImpl_##type##_fromhost(type*, uint32_t) {}
LIST_TRANSFORMED_TYPES(DEFINE_TRANSFORMED_TYPE_IMPL)
diff --git a/system/vulkan_enc/ResourceTracker.h b/system/vulkan_enc/ResourceTracker.h
index 2bd670c..ed683b2 100644
--- a/system/vulkan_enc/ResourceTracker.h
+++ b/system/vulkan_enc/ResourceTracker.h
@@ -572,13 +572,20 @@
uint32_t* typeIndex, uint32_t typeIndexCount,
uint32_t* typeBits, uint32_t typeBitsCount);
-#define DEFINE_TRANSFORMED_TYPE_PROTOTYPE(type) \
- void transformImpl_##type##_tohost(const type*, uint32_t); \
- void transformImpl_##type##_fromhost(const type*, uint32_t); \
+ void transformImpl_VkExternalMemoryProperties_fromhost(
+ VkExternalMemoryProperties* pProperties,
+ uint32_t);
+ void transformImpl_VkExternalMemoryProperties_tohost(
+ VkExternalMemoryProperties* pProperties,
+ uint32_t);
-LIST_TRANSFORMED_TYPES(DEFINE_TRANSFORMED_TYPE_PROTOTYPE)
+#define DEFINE_TRANSFORMED_TYPE_PROTOTYPE(type) \
+ void transformImpl_##type##_tohost(type*, uint32_t); \
+ void transformImpl_##type##_fromhost(type*, uint32_t);
- private:
+ LIST_TRANSFORMED_TYPES(DEFINE_TRANSFORMED_TYPE_PROTOTYPE)
+
+private:
class Impl;
std::unique_ptr<Impl> mImpl;
};
diff --git a/system/vulkan_enc/goldfish_vk_transform_guest.h b/system/vulkan_enc/goldfish_vk_transform_guest.h
index 11cca3e..60f542f 100644
--- a/system/vulkan_enc/goldfish_vk_transform_guest.h
+++ b/system/vulkan_enc/goldfish_vk_transform_guest.h
@@ -36,7 +36,6 @@
class ResourceTracker;
#define LIST_TRANSFORMED_TYPES(f) \
-f(VkExternalMemoryProperties) \
f(VkPhysicalDeviceExternalImageFormatInfo) \
f(VkPhysicalDeviceExternalBufferInfo) \
f(VkExternalMemoryImageCreateInfo) \
