From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Thu, 10 Jun 2021 16:26:01 +0000 (+0000)
Subject: vulkan: fix back compat with Android Oreo and below
X-Git-Tag: upstream/21.2.3~2215
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02832f9d03c80b32a4837432e3fc18db29b05148;p=platform%2Fupstream%2Fmesa.git

vulkan: fix back compat with Android Oreo and below

buffer_handle_t definition was previously inside the deprecated
system/core/include/system/window.h.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Acked-by: Chia-I Wu <olvaffe@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11301>
---

diff --git a/include/vulkan/vk_android_native_buffer.h b/include/vulkan/vk_android_native_buffer.h
index 17bfd11..52d7a94 100644
--- a/include/vulkan/vk_android_native_buffer.h
+++ b/include/vulkan/vk_android_native_buffer.h
@@ -20,6 +20,12 @@
 #ifdef ANDROID
 #include <cutils/native_handle.h>
 #include <vulkan/vulkan.h>
+
+#if ANDROID_API_LEVEL < 28
+/* buffer_handle_t was defined in the deprecated system/window.h */
+typedef const native_handle_t *buffer_handle_t;
+#endif
+
 #else
 typedef void *buffer_handle_t;
 #endif