Commit b4224cfb authored by Eric Engestrom's avatar Eric Engestrom Committed by Marge Bot

meson: fix android vulkan build

Android doesn't have `pthread_cancel()` and is unlikely to ever
implement it [1], but `wsi_common_display.c` needs it (or an
alternative).

Let's just disable the platform on Android (as it used to be
before 448eb191).

[1] https://android-review.googlesource.com/c/platform/bionic/+/1215779/1/docs/status.md

Fixes: 448eb191 ("vulkan: automatically compile the `display` platform when available")
Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
Acked-by: Nataraj Deshpande's avatarNataraj Deshpande <nataraj.deshpande@intel.com>
Part-of: <mesa/mesa!5860>
parent d4f4546a
Pipeline #176344 passed with stages
in 135 minutes and 48 seconds
......@@ -131,7 +131,7 @@ if with_platform_wayland
libradv_files += files('radv_wsi_wayland.c')
endif
if system_has_kms_drm
if system_has_kms_drm and not with_platform_android
radv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
libradv_files += files('radv_wsi_display.c')
endif
......
......@@ -81,7 +81,7 @@ if with_platform_wayland
libtu_files += files('tu_wsi_wayland.c')
endif
if system_has_kms_drm
if system_has_kms_drm and not with_platform_android
tu_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
libtu_files += files('tu_wsi_display.c')
endif
......
......@@ -155,7 +155,7 @@ if with_platform_wayland
libanv_files += files('anv_wsi_wayland.c')
endif
if system_has_kms_drm
if system_has_kms_drm and not with_platform_android
anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
libanv_files += files('anv_wsi_display.c')
endif
......
......@@ -45,7 +45,7 @@ if with_platform_wayland
vulkan_wsi_deps += dep_wayland_client
vulkan_wsi_list += ['wayland']
endif
if system_has_kms_drm
if system_has_kms_drm and not with_platform_android
vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
vulkan_wsi_deps += [dep_libdrm]
vulkan_wsi_list += ['drm']
......
......@@ -34,7 +34,7 @@ if with_platform_wayland
]
endif
if system_has_kms_drm
if system_has_kms_drm and not with_platform_android
files_vulkan_wsi += files('wsi_common_display.c')
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment