commit 9ddaa7d74635b68cbc06e930cf51d82ab63534b1
author Gurchetan Singh <gurchetansingh@chromium.org> Mon Oct 25 17:58:24 2021 -0700
committer Gurchetan Singh <gurchetansingh@google.com> Mon Oct 25 17:58:44 2021 -0700
tree 8c6fd6b4c9e87c500a7f4196c98d7a1e40506974
parent 6c906de23eed426cac15a1f3c62b8c0b36f03ebf

goldfish-opengl: Refactor platform-specific defines

Helps with Linux build:

- Don't only define Fuchsia-specific bits internally when
  VK_USE_PLATFORM_ANDROID_KHR is set, but when
  VK_USE_PLATFORM_FUCHSIA is not set.

- Don't only define Android-specific bits internally when
  VK_USE_PLATFORM_FUCHSIA_KHR is set, but when
  VK_USE_PLATFORM_ANDROID is not set.

BUG=202552093
TEST=compile

Change-Id: Id9b0ce05af8f0bc8744ec6d572a14b2a2fe3e902

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 7bf1f03..8395810 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -28,26 +28,7 @@
 #include "../OpenglSystemCommon/EmulatorFeatureInfo.h"
 #include "../OpenglSystemCommon/HostConnection.h"
 
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-
-#include "../egl/goldfish_sync.h"
-
-typedef uint32_t zx_handle_t;
-typedef uint64_t zx_koid_t;
-#define ZX_HANDLE_INVALID         ((zx_handle_t)0)
-#define ZX_KOID_INVALID ((zx_koid_t)0)
-void zx_handle_close(zx_handle_t) { }
-void zx_event_create(int, zx_handle_t*) { }
-
-#include "AndroidHardwareBuffer.h"
-
-#ifndef HOST_BUILD
-#include "virtgpu_drm.h"
-#include <xf86drm.h>
-#endif
-
-#endif // VK_USE_PLATFORM_ANDROID_KHR
-
+/// Use installed headers or locally defined Fuchsia-specific bits
 #ifdef VK_USE_PLATFORM_FUCHSIA
 
 #include <cutils/native_handle.h>
@@ -70,6 +51,30 @@
 #define GET_STATUS_SAFE(result, member) \
     ((result).ok() ? ((result).Unwrap()->member) : ZX_OK)
 
+#else
+
+typedef uint32_t zx_handle_t;
+typedef uint64_t zx_koid_t;
+#define ZX_HANDLE_INVALID         ((zx_handle_t)0)
+#define ZX_KOID_INVALID ((zx_koid_t)0)
+void zx_handle_close(zx_handle_t) { }
+void zx_event_create(int, zx_handle_t*) { }
+#endif // VK_USE_PLATFORM_FUCHSIA
+
+/// Use installed headers or locally defined Android-specific bits
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+
+/// Goldfish sync only used for AEMU -- should replace in virtio-gpu when possibe
+#include "../egl/goldfish_sync.h"
+#include "AndroidHardwareBuffer.h"
+
+#ifndef HOST_BUILD
+#include "virtgpu_drm.h"
+#include <xf86drm.h>
+#endif
+
+#else
+
 struct AHardwareBuffer;
 
 void AHardwareBuffer_release(AHardwareBuffer*) { }
@@ -116,7 +121,7 @@
 
 VkResult getMemoryAndroidHardwareBufferANDROID(struct AHardwareBuffer **) { return VK_SUCCESS; }
 
-#endif // VK_USE_PLATFORM_FUCHSIA
+#endif // VK_USE_PLATFORM_ANDROID_KHR
 
 #include "HostVisibleMemoryVirtualization.h"
 #include "Resources.h"