From f245339120c5b1f1e803abdafa30fbe3a039e83e Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Tue, 30 Jan 2024 10:29:05 -0800
Subject: [PATCH] venus: refactor to use DETECT_OS_ANDROID instead of ANDROID

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27374>
---
 src/virtio/vulkan/vn_android.h         |  4 ++--
 src/virtio/vulkan/vn_common.c          |  2 +-
 src/virtio/vulkan/vn_common.h          |  3 ++-
 src/virtio/vulkan/vn_device.c          |  2 +-
 src/virtio/vulkan/vn_image.c           |  2 +-
 src/virtio/vulkan/vn_physical_device.c | 12 ++++++------
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/virtio/vulkan/vn_android.h b/src/virtio/vulkan/vn_android.h
index 7f2736ea995..3a281e91539 100644
--- a/src/virtio/vulkan/vn_android.h
+++ b/src/virtio/vulkan/vn_android.h
@@ -20,7 +20,7 @@
 /* venus implements VK_ANDROID_native_buffer up to spec version 7 */
 #define VN_ANDROID_NATIVE_BUFFER_SPEC_VERSION 7
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
 
 VkResult
 vn_android_image_from_anb(struct vn_device *dev,
@@ -117,6 +117,6 @@ vn_android_gralloc_get_shared_present_usage(void)
    return 0;
 }
 
-#endif /* ANDROID */
+#endif /* DETECT_OS_ANDROID */
 
 #endif /* VN_ANDROID_H */
diff --git a/src/virtio/vulkan/vn_common.c b/src/virtio/vulkan/vn_common.c
index bc35b74ac4c..7634c1b07a3 100644
--- a/src/virtio/vulkan/vn_common.c
+++ b/src/virtio/vulkan/vn_common.c
@@ -97,7 +97,7 @@ vn_env_init(void)
 void
 vn_trace_init(void)
 {
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    atrace_init();
 #else
    util_cpu_trace_init();
diff --git a/src/virtio/vulkan/vn_common.h b/src/virtio/vulkan/vn_common.h
index c9dc8a11c88..7456e260b16 100644
--- a/src/virtio/vulkan/vn_common.h
+++ b/src/virtio/vulkan/vn_common.h
@@ -28,6 +28,7 @@
 #include "util/bitscan.h"
 #include "util/bitset.h"
 #include "util/compiler.h"
+#include "util/detect_os.h"
 #include "util/libsync.h"
 #include "util/list.h"
 #include "util/macros.h"
@@ -501,7 +502,7 @@ vn_object_get_id(const void *obj, VkObjectType type)
 static inline pid_t
 vn_gettid(void)
 {
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    return gettid();
 #else
    return syscall(SYS_gettid);
diff --git a/src/virtio/vulkan/vn_device.c b/src/virtio/vulkan/vn_device.c
index e263d6d2b82..52e41c5c0af 100644
--- a/src/virtio/vulkan/vn_device.c
+++ b/src/virtio/vulkan/vn_device.c
@@ -412,7 +412,7 @@ vn_device_update_shader_cache_id(struct vn_device *dev)
     * The shader cache is destroyed after creating the necessary files
     * and not utilized by venus.
     */
-#if !defined(ANDROID) && defined(ENABLE_SHADER_CACHE)
+#if !DETECT_OS_ANDROID && defined(ENABLE_SHADER_CACHE)
    const VkPhysicalDeviceProperties *vulkan_1_0_props =
       &dev->physical_device->properties.vulkan_1_0;
 
diff --git a/src/virtio/vulkan/vn_image.c b/src/virtio/vulkan/vn_image.c
index f56b372f2b0..f4c041721d1 100644
--- a/src/virtio/vulkan/vn_image.c
+++ b/src/virtio/vulkan/vn_image.c
@@ -771,7 +771,7 @@ vn_BindImageMemory2(VkDevice device,
       }
 
       if (!mem) {
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
          /* TODO handle VkNativeBufferANDROID when we bump up
           * VN_ANDROID_NATIVE_BUFFER_SPEC_VERSION
           */
diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 602c6025db6..7c1914283dc 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -835,14 +835,14 @@ vn_physical_device_init_external_memory(
       physical_dev->external_memory.renderer_handle_type =
          VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
       physical_dev->external_memory.supported_handle_types |=
          VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID;
-#else  /* ANDROID */
+#else  /* DETECT_OS_ANDROID */
       physical_dev->external_memory.supported_handle_types =
          VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT |
          VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT;
-#endif /* ANDROID */
+#endif /* DETECT_OS_ANDROID */
    }
 }
 
@@ -981,7 +981,7 @@ vn_physical_device_get_native_extensions(
    const bool can_external_mem =
       vn_physical_device_get_external_memory_support(physical_dev);
    if (can_external_mem) {
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
       exts->ANDROID_external_memory_android_hardware_buffer = true;
 
       /* For wsi, we require renderer:
@@ -997,10 +997,10 @@ vn_physical_device_get_native_extensions(
       if (physical_dev->renderer_sync_fd.semaphore_importable &&
           physical_dev->renderer_sync_fd.fence_exportable)
          exts->ANDROID_native_buffer = true;
-#else  /* ANDROID */
+#else  /* DETECT_OS_ANDROID */
       exts->KHR_external_memory_fd = true;
       exts->EXT_external_memory_dma_buf = true;
-#endif /* ANDROID */
+#endif /* DETECT_OS_ANDROID */
    }
 
 #ifdef VN_USE_WSI_PLATFORM