commit d5a6c1690480851c12aaaf5789f636df92d29c32
author Yilong Li <liyl@google.com> Tue Jan 04 01:03:12 2022 -0800
committer Yilong Li <liyl@google.com> Tue Jan 04 10:40:16 2022 +0000
tree 2b058fcb26cffa024bdb32f54fe80e0be0eff29c
parent 8f2f8b7d710751ae8e1077d4380742eb6e2c81ae

fuchsia: Remove all references to FUCHSIA(X) for non-Fuchsia builds

This change adds #ifdefs to make sure that all references
to FUCHSIA(X) identifiers are only used on Fuchsia builds
where VK_USE_PLATFORM_FUCHSIA is defined.

Bug: 187216205
Change-Id: I950327500edf6816da6d2d918ad39f4044d9572a

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 01420bb..8ac0735 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -3276,6 +3276,7 @@
         const VkImportAndroidHardwareBufferInfoANDROID* importAhbInfoPtr =
             vk_find_struct<VkImportAndroidHardwareBufferInfoANDROID>(pAllocateInfo);
 
+#ifdef VK_USE_PLATFORM_FUCHSIA
         const VkImportMemoryBufferCollectionFUCHSIAX*
             importBufferCollectionInfoPtr =
                 vk_find_struct<VkImportMemoryBufferCollectionFUCHSIAX>(
@@ -3297,6 +3298,10 @@
                 __vk_find_struct(const_cast<void*>(pAllocateInfo->pNext),
                     VK_STRUCTURE_TYPE_TEMP_IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA));
         }
+#else
+        const void* importBufferCollectionInfoPtr = nullptr;
+        const void* importVmoInfoPtr = nullptr;
+#endif  // VK_USE_PLATFORM_FUCHSIA
 
         const VkMemoryDedicatedAllocateInfo* dedicatedAllocInfoPtr =
             vk_find_struct<VkMemoryDedicatedAllocateInfo>(pAllocateInfo);
@@ -3352,11 +3357,13 @@
             exportAhb =
                 exportAllocateInfoPtr->handleTypes &
                 VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
+#ifdef VK_USE_PLATFORM_FUCHSIA
             exportVmo =
                 (exportAllocateInfoPtr->handleTypes &
                     VK_EXTERNAL_MEMORY_HANDLE_TYPE_TEMP_ZIRCON_VMO_BIT_FUCHSIA) ||
                 (exportAllocateInfoPtr->handleTypes &
                     VK_EXTERNAL_MEMORY_HANDLE_TYPE_ZIRCON_VMO_BIT_FUCHSIA);
+#endif  // VK_USE_PLATFORM_FUCHSIA
         } else if (importAhbInfoPtr) {
             importAhb = true;
         } else if (importBufferCollectionInfoPtr) {
@@ -3444,9 +3451,8 @@
 
         zx_handle_t vmo_handle = ZX_HANDLE_INVALID;
 
-        if (importBufferCollection) {
-
 #ifdef VK_USE_PLATFORM_FUCHSIA
+        if (importBufferCollection) {
             const auto& collection = *reinterpret_cast<
                 fidl::WireSyncClient<fuchsia_sysmem::BufferCollection>*>(
                 importBufferCollectionInfoPtr->collection);
@@ -3464,15 +3470,12 @@
                 _RETURN_FAILURE_WITH_DEVICE_MEMORY_REPORT(VK_ERROR_INITIALIZATION_FAILED);
             }
             vmo_handle = info.buffers[index].vmo.release();
-#endif
-
         }
 
         if (importVmo) {
             vmo_handle = importVmoInfoPtr->handle;
         }
 
-#ifdef VK_USE_PLATFORM_FUCHSIA
         if (exportVmo) {
             bool hasDedicatedImage = dedicatedAllocInfoPtr &&
                 (dedicatedAllocInfoPtr->image != VK_NULL_HANDLE);