OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Fix Asahi build on macOS

Browse Source 
!19950 introduced a dependency between NIR and Vulkan headers, and the
Vulkan headers try to include X11 headers we cannot find on macOS.

Disable this (we have no plans for Vulkan on the macOS testing platform
anyway).

Signed-off-by: Asahi Lina <lina@asahilina.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21059>
This commit is contained in:
Asahi Lina
2023-02-02 12:16:01 +09:00
committed by Marge Bot
parent bfa7ec0aa0
commit 4ca4a05627
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -364,7 +364,7 @@ if with_platform_wayland
#add this once aco and other places can build with it #add this once aco and other places can build with it
#cpp_args += '-DVK_USE_PLATFORM_WAYLAND_KHR' #cpp_args += '-DVK_USE_PLATFORM_WAYLAND_KHR'
endif endif
if with_platform_x11 if with_platform_x11 and host_machine.system() != 'darwin'
c_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] c_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
#add this once aco and other places can build with it #add this once aco and other places can build with it
#cpp_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] #cpp_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']