mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-06 13:10:10 +01:00
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 before448eb19158). [1] https://android-review.googlesource.com/c/platform/bionic/+/1215779/1/docs/status.md Fixes:448eb19158("vulkan: automatically compile the `display` platform when available") Signed-off-by: Eric Engestrom <eric@engestrom.ch> Acked-by: Nataraj Deshpande <nataraj.deshpande@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5860>
This commit is contained in:
parent
3ed104b2aa
commit
f95637f01a
5 changed files with 5 additions and 5 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue