| From 97246c5b0a5088dc9df18be392e8af5c83320914 Mon Sep 17 00:00:00 2001 |
| From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> |
| Date: Wed, 19 Jun 2019 15:05:40 +0200 |
| Subject: [PATCH 1/3] anv: Fix vulkan build in meson. |
| |
| Apparently the android part was never ported to meson. |
| |
| CC: <mesa-stable@lists.freedesktop.org> |
| Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> |
| (cherry picked from commit 755c633b8d9c15227ad07bbc98f06627d4ecf55d) |
| --- |
| src/intel/vulkan/meson.build | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build |
| index ffd1985f251..86209b4857d 100644 |
| --- a/src/intel/vulkan/meson.build |
| +++ b/src/intel/vulkan/meson.build |
| @@ -111,7 +111,6 @@ endforeach |
| |
| libanv_files = files( |
| 'anv_allocator.c', |
| - 'anv_android_stubs.c', |
| 'anv_android.h', |
| 'anv_batch_chain.c', |
| 'anv_blorp.c', |
| @@ -176,6 +175,13 @@ if with_xlib_lease |
| anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' |
| endif |
| |
| +if with_platform_android |
| + anv_flags += '-DVK_USE_PLATFORM_ANDROID_KHR' |
| + libanv_files += files('anv_android.c') |
| +else |
| + libanv_files += files('anv_android_stubs.c') |
| +endif |
| + |
| libanv_common = static_library( |
| 'anv_common', |
| [ |
| -- |
| 2.22.0.709.g102302147b-goog |
| |
