[guest] Fix Fuchsia build
Major changes:
- remove QemuPipeStreamFuchsia
- reinstate processPipeDoInit() for initSeqno(), but skip the rest
- revamp the .gn build file
Bug:282968393
Change-Id: I59503019ac1ebb1a1fac16297eb0e68f2303d65b
diff --git a/guest/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp
index c2a514c..4ce1e40 100644
--- a/guest/vulkan_enc/ResourceTracker.cpp
+++ b/guest/vulkan_enc/ResourceTracker.cpp
@@ -497,7 +497,7 @@
// TODO(fxbug.dev/90856): This is currently only used for allocating
// memory for dedicated external images. It should be migrated to use
// SetBufferCollectionImageConstraintsFUCHSIA.
-VkResult setBufferCollectionConstraintsFUCHSIA(
+VkResult ResourceTracker::setBufferCollectionConstraintsFUCHSIA(
VkEncoder* enc, VkDevice device,
fidl::WireSyncClient<fuchsia_sysmem::BufferCollection>* collection,
const VkImageCreateInfo* pImageInfo) {
@@ -639,7 +639,7 @@
createInfoDup.pNext = nullptr;
enc->vkGetLinearImageLayout2GOOGLE(device, &createInfoDup, &offset, &rowPitchAlignment,
true /* do lock */);
- D("vkGetLinearImageLayout2GOOGLE: format %d offset %lu "
+ ALOGD("vkGetLinearImageLayout2GOOGLE: format %d offset %lu "
"rowPitchAlignment = %lu",
(int)createInfo->format, offset, rowPitchAlignment);
}
@@ -672,17 +672,6 @@
return VK_SUCCESS;
}
-struct SetBufferCollectionImageConstraintsResult {
- VkResult result;
- fuchsia_sysmem::wire::BufferCollectionConstraints constraints;
- std::vector<uint32_t> createInfoIndex;
-};
-
-struct SetBufferCollectionBufferConstraintsResult {
- VkResult result;
- fuchsia_sysmem::wire::BufferCollectionConstraints constraints;
-};
-
SetBufferCollectionBufferConstraintsResult setBufferCollectionBufferConstraintsImpl(
fidl::WireSyncClient<fuchsia_sysmem::BufferCollection>* pCollection,
const VkBufferConstraintsInfoFUCHSIA* pBufferConstraintsInfo) {
@@ -731,8 +720,8 @@
dedicatedReqs->requiresDedicatedAllocation = VK_TRUE;
}
-void setMemoryRequirementsForSysmemBackedImage(VkImage image,
- VkMemoryRequirements* pMemoryRequirements) {
+void ResourceTracker::setMemoryRequirementsForSysmemBackedImage(VkImage image,
+ VkMemoryRequirements* pMemoryRequirements) {
#ifdef VK_USE_PLATFORM_FUCHSIA
auto it = info_VkImage.find(image);
if (it == info_VkImage.end()) return;
@@ -749,7 +738,8 @@
#endif
}
-void transformImageMemoryRequirementsForGuestLocked(VkImage image, VkMemoryRequirements* reqs) {
+void ResourceTracker::transformImageMemoryRequirementsForGuestLocked(VkImage image,
+ VkMemoryRequirements* reqs) {
setMemoryRequirementsForSysmemBackedImage(image, reqs);
}
@@ -2623,7 +2613,7 @@
return setBufferCollectionBufferConstraintsFUCHSIA(sysmem_collection, pBufferConstraintsInfo);
}
-VkResult getBufferCollectionImageCreateInfoIndexLocked(
+VkResult ResourceTracker::getBufferCollectionImageCreateInfoIndexLocked(
VkBufferCollectionFUCHSIA collection, fuchsia_sysmem::wire::BufferCollectionInfo2& info,
uint32_t* outCreateInfoIndex) {
if (!info_VkBufferCollectionFUCHSIA[collection].constraints.hasValue()) {
@@ -6137,7 +6127,7 @@
return VK_ERROR_FORMAT_NOT_SUPPORTED;
}
}
- supportedHandleType |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VM_BIT_FUCHSIA;
+ supportedHandleType |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA;
#endif
#ifdef VK_USE_PLATFORM_ANDROID_KHR
@@ -6222,7 +6212,7 @@
uint32_t supportedHandleType = 0;
#ifdef VK_USE_PLATFORM_FUCHSIA
- supportedHandleType |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VM_BIT_FUCHSIA;
+ supportedHandleType |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA;
#endif
#ifdef VK_USE_PLATFORM_ANDROID_KHR
supportedHandleType |= VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT |
