From 5a37340689d08f5246ebbb6834aab57aaaa2f713 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Tue, 30 Jan 2024 13:44:29 -0800
Subject: [PATCH] turnip: 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/freedreno/vulkan/tu_common.h    | 1 +
 src/freedreno/vulkan/tu_device.cc   | 2 +-
 src/freedreno/vulkan/tu_device.h    | 4 ++--
 src/freedreno/vulkan/tu_image.cc    | 6 +++---
 src/freedreno/vulkan/tu_image.h     | 2 +-
 src/freedreno/vulkan/tu_knl.cc      | 2 +-
 src/freedreno/vulkan/tu_perfetto.cc | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/freedreno/vulkan/tu_common.h b/src/freedreno/vulkan/tu_common.h
index 7056b578144..940d1b7f66d 100644
--- a/src/freedreno/vulkan/tu_common.h
+++ b/src/freedreno/vulkan/tu_common.h
@@ -31,6 +31,7 @@
 #include "c11/threads.h"
 #include "util/rounding.h"
 #include "util/bitscan.h"
+#include "util/detect_os.h"
 #include "util/list.h"
 #include "util/log.h"
 #include "util/macros.h"
diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc
index 8367a8a54a2..fba4994ea3c 100644
--- a/src/freedreno/vulkan/tu_device.cc
+++ b/src/freedreno/vulkan/tu_device.cc
@@ -273,7 +273,7 @@ get_device_extensions(const struct tu_physical_device *device,
 
       /* For Graphics Flight Recorder (GFR) */
       .AMD_buffer_marker = true,
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
       .ANDROID_native_buffer = true,
 #endif
       .ARM_rasterization_order_attachment_access = true,
diff --git a/src/freedreno/vulkan/tu_device.h b/src/freedreno/vulkan/tu_device.h
index 2015339873c..e27cba5ca61 100644
--- a/src/freedreno/vulkan/tu_device.h
+++ b/src/freedreno/vulkan/tu_device.h
@@ -236,7 +236,7 @@ struct tu_pvtmem_bo {
       uint32_t per_fiber_size, per_sp_size;
 };
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
 enum tu_gralloc_type
 {
    TU_GRALLOC_UNKNOWN,
@@ -379,7 +379,7 @@ struct tu_device
    struct tu_cs *dbg_cmdbuf_stomp_cs;
    struct tu_cs *dbg_renderpass_stomp_cs;
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    const void *gralloc;
    enum tu_gralloc_type gralloc_type;
 #endif
diff --git a/src/freedreno/vulkan/tu_image.cc b/src/freedreno/vulkan/tu_image.cc
index f7c3cb71ace..c6b7d4c15d0 100644
--- a/src/freedreno/vulkan/tu_image.cc
+++ b/src/freedreno/vulkan/tu_image.cc
@@ -726,7 +726,7 @@ tu_CreateImage(VkDevice _device,
          modifier = DRM_FORMAT_MOD_LINEAR;
    }
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    const VkNativeBufferANDROID *gralloc_info =
       vk_find_struct_const(pCreateInfo->pNext, NATIVE_BUFFER_ANDROID);
    int dma_buf;
@@ -746,7 +746,7 @@ tu_CreateImage(VkDevice _device,
 
    *pImage = tu_image_to_handle(image);
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    if (gralloc_info)
       return tu_import_memory_from_gralloc_handle(_device, dma_buf, alloc,
                                                   *pImage);
@@ -765,7 +765,7 @@ tu_DestroyImage(VkDevice _device,
    if (!image)
       return;
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    if (image->owned_memory != VK_NULL_HANDLE)
       tu_FreeMemory(_device, image->owned_memory, pAllocator);
 #endif
diff --git a/src/freedreno/vulkan/tu_image.h b/src/freedreno/vulkan/tu_image.h
index d5ee3dc9f71..0f674905492 100644
--- a/src/freedreno/vulkan/tu_image.h
+++ b/src/freedreno/vulkan/tu_image.h
@@ -25,7 +25,7 @@ struct tu_image
    struct fdl_layout layout[3];
    uint32_t total_size;
 
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    /* For VK_ANDROID_native_buffer, the WSI image owns the memory, */
    VkDeviceMemory owned_memory;
 #endif
diff --git a/src/freedreno/vulkan/tu_knl.cc b/src/freedreno/vulkan/tu_knl.cc
index 24acbd237b7..504fb55398d 100644
--- a/src/freedreno/vulkan/tu_knl.cc
+++ b/src/freedreno/vulkan/tu_knl.cc
@@ -187,7 +187,7 @@ l1_dcache_size()
       return 0;
 
 #if DETECT_ARCH_AARCH64 &&                                                   \
-   (!defined(_SC_LEVEL1_DCACHE_LINESIZE) || defined(ANDROID))
+   (!defined(_SC_LEVEL1_DCACHE_LINESIZE) || DETECT_OS_ANDROID)
    /* Bionic does not implement _SC_LEVEL1_DCACHE_LINESIZE properly: */
    uint64_t ctr_el0;
    asm("mrs\t%x0, ctr_el0" : "=r"(ctr_el0));
diff --git a/src/freedreno/vulkan/tu_perfetto.cc b/src/freedreno/vulkan/tu_perfetto.cc
index b1b9eab9ba5..b2b8b65d00e 100644
--- a/src/freedreno/vulkan/tu_perfetto.cc
+++ b/src/freedreno/vulkan/tu_perfetto.cc
@@ -311,7 +311,7 @@ tu_perfetto_init(void)
    util_perfetto_init();
 
    perfetto::DataSourceDescriptor dsd;
-#ifdef ANDROID
+#if DETECT_OS_ANDROID
    /* AGI requires this name */
    dsd.set_name("gpu.renderstages");
 #else