From 61790c60ddd3005ed230b7864d8f46452bd59bde Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 29 Jul 2022 17:59:08 -0700
Subject: [PATCH] turnip: add tu_android.h

(cherry picked from commit e99703b515ccbc0e64de888b30245b02fde081a6)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17877>
---
 src/freedreno/vulkan/tu_android.c |  1 +
 src/freedreno/vulkan/tu_android.h | 27 +++++++++++++++++++++++++++
 src/freedreno/vulkan/tu_private.h | 13 +------------
 3 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 src/freedreno/vulkan/tu_android.h

diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c
index 6317cc31f4c..eb80c2fd040 100644
--- a/src/freedreno/vulkan/tu_android.c
+++ b/src/freedreno/vulkan/tu_android.c
@@ -21,6 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "tu_android.h"
 #include "tu_private.h"
 
 #include <hardware/gralloc.h>
diff --git a/src/freedreno/vulkan/tu_android.h b/src/freedreno/vulkan/tu_android.h
new file mode 100644
index 00000000000..5f52a5e3dff
--- /dev/null
+++ b/src/freedreno/vulkan/tu_android.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2016 Red Hat.
+ * Copyright © 2016 Bas Nieuwenhuizen
+ * SPDX-License-Identifier: MIT
+ *
+ * based in part on anv driver which is:
+ * Copyright © 2015 Intel Corporation
+ */
+
+#ifndef TU_ANDROID_H
+#define TU_ANDROID_H
+
+#include "tu_common.h"
+
+VkResult
+tu_gralloc_info(struct tu_device *device,
+                const VkNativeBufferANDROID *gralloc_info,
+                int *dma_buf,
+                uint64_t *modifier);
+
+VkResult
+tu_import_memory_from_gralloc_handle(VkDevice device_h,
+                                     int dma_buf,
+                                     const VkAllocationCallbacks *alloc,
+                                     VkImage image_h);
+
+#endif /* TU_ANDROID_H */
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index c655e4f0e0d..3a517e4ab1b 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -29,6 +29,7 @@
 #define TU_PRIVATE_H
 
 #include "tu_common.h"
+#include "tu_android.h"
 #include "tu_autotune.h"
 #include "tu_clear_blit.h"
 #include "tu_cmd_buffer.h"
@@ -97,16 +98,4 @@ tu_framebuffer_tiling_config(struct tu_framebuffer *fb,
                              const struct tu_device *device,
                              const struct tu_render_pass *pass);
 
-VkResult
-tu_gralloc_info(struct tu_device *device,
-                const VkNativeBufferANDROID *gralloc_info,
-                int *dma_buf,
-                uint64_t *modifier);
-
-VkResult
-tu_import_memory_from_gralloc_handle(VkDevice device_h,
-                                     int dma_buf,
-                                     const VkAllocationCallbacks *alloc,
-                                     VkImage image_h);
-
 #endif /* TU_PRIVATE_H */