commit 650c0c033aceede8f1eb6088c9fe7fbceba1c34b
author Jason Macnak <natsu@google.com> Thu Jul 20 16:06:53 2023 -0700
committer Jason Macnak <natsu@google.com> Mon Sep 11 12:15:12 2023 -0700
tree 4c83383844d2dbb610d5f09a22e20fa7d49fa764
parent 80a36d12b83e6e93d359e5f36d08bbad65b85796

Enable building guest Gfxstream components on host

... so that upcoming end2end tests can use the GL/VK ICDs.

Bug: b/292257025
Test: mma
Change-Id: I8f3a19a6f8f81b2f368b4a1d5031d9e77358e327

guest/vulkan_enc/ResourceTracker.cpp

diff --git a/guest/vulkan_enc/ResourceTracker.cpp b/guest/vulkan_enc/ResourceTracker.cpp
index 46db16f..cdc8481 100644
--- a/guest/vulkan_enc/ResourceTracker.cpp
+++ b/guest/vulkan_enc/ResourceTracker.cpp
@@ -116,6 +116,11 @@
     TempFile* tmpFile = tempfile_create();
     return open(tempfile_path(tmpFile), O_RDWR);
     // TODO: Windows is not suppose to support VkSemaphoreGetFdInfoKHR
+#elif !defined(__ANDROID__)
+    (void)name;
+    (void)flags;
+    ALOGE("Not yet supported.");
+    abort();
 #else
     return syscall(SYS_memfd_create, name, flags);
 #endif
@@ -304,7 +309,9 @@
         uint64_t coherentMemorySize = 0;
         uint64_t coherentMemoryOffset = 0;
 
+#if defined(__ANDROID__)
         GoldfishAddressSpaceBlockPtr goldfishBlock = nullptr;
+#endif  // defined(__ANDROID__)
         CoherentMemoryPtr coherentMemory = nullptr;
     };
 
@@ -926,11 +933,13 @@
         mFeatureInfo.reset(new EmulatorFeatureInfo);
         *mFeatureInfo = *features;
 
+#if defined(__ANDROID__)
         if (mFeatureInfo->hasDirectMem) {
             mGoldfishAddressSpaceBlockProvider.reset(
                 new GoldfishAddressSpaceBlockProvider(
                     GoldfishAddressSpaceSubdeviceType::NoSubdevice));
         }
+#endif  // defined(__ANDROID__)
 
 #ifdef VK_USE_PLATFORM_FUCHSIA
         if (mFeatureInfo->hasVulkan) {
@@ -2907,6 +2916,8 @@
                                            VkResult& res)
     {
         CoherentMemoryPtr coherentMemory = nullptr;
+
+#if defined(__ANDROID__)
         if (mFeatureInfo->hasDirectMem) {
             uint64_t gpuAddr = 0;
             GoldfishAddressSpaceBlockPtr block = nullptr;
@@ -2933,7 +2944,9 @@
                 coherentMemory =
                     std::make_shared<CoherentMemory>(block, gpuAddr, hostAllocationInfo.allocationSize, device, mem);
             }
-        } else if (mFeatureInfo->hasVirtioGpuNext) {
+        } else
+#endif // defined(__ANDROID__)
+        if (mFeatureInfo->hasVirtioGpuNext) {
             struct VirtGpuCreateBlob createBlob = { 0 };
             uint64_t hvaSizeId[3];
             res = enc->vkGetMemoryHostAddressInfoGOOGLE(device, mem,
@@ -6255,6 +6268,7 @@
             return VK_ERROR_OUT_OF_HOST_MEMORY;
         }
 
+#if defined(__ANDROID__)
         auto& memInfo = it->second;
 
         GoldfishAddressSpaceBlockPtr block = std::make_shared<GoldfishAddressSpaceBlock>();
@@ -6264,6 +6278,10 @@
         *pAddress = block->physAddr();
 
         return VK_SUCCESS;
+#else
+        (void)pAddress;
+        return VK_ERROR_MEMORY_MAP_FAILED;
+#endif
     }
 
     VkResult on_vkMapMemoryIntoAddressSpaceGOOGLE(
@@ -7481,7 +7499,9 @@
 
     std::optional<const VkPhysicalDeviceMemoryProperties> mCachedPhysicalDeviceMemoryProps;
     std::unique_ptr<EmulatorFeatureInfo> mFeatureInfo;
+#if defined(__ANDROID__)
     std::unique_ptr<GoldfishAddressSpaceBlockProvider> mGoldfishAddressSpaceBlockProvider;
+#endif  // defined(__ANDROID__)
 
     struct VirtGpuCaps mCaps;
     std::vector<VkExtensionProperties> mHostInstanceExtensions;