KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: Fix building on macOS 

This fixes building on macOS:
  Disable ZINK_USE_DMABUF on macOS, it is unsupported.
  Import vk_mvk_moltenvk.h for MVK_VERSION in zink_resource.c.
  Add additional build arguments (see meson.build) to build properly.

To build on macOS, you will probably need to run:
  brew install bison llvm cmake libxext xquartz ninja xorgproto meson

And you also need to setup meson with something like:
  -Dmoltenvk-dir=/Users/<Username>/VulkanSDK/<VersionNumber>/MoltenVK
  -Dc_std=c11

Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14255>
This commit is contained in:
Hamish Arblaster 2021-12-19 00:10:11 +00:00 committed by Marge Bot
parent eca7b24e74
commit cafca76fa2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -426,6 +426,15 @@ if system_has_kms_drm and not with_platform_android
c_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
cpp_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
endif
if host_machine.system() == 'darwin'
c_args += '-DVK_USE_PLATFORM_MACOS_MVK'
cpp_args += '-DVK_USE_PLATFORM_MACOS_MVK'
c_args += '-DVK_USE_PLATFORM_METAL_EXT'
cpp_args += '-DVK_USE_PLATFORM_METAL_EXT'
#macOS seems to need beta extensions to build for now:
c_args += '-DVK_ENABLE_BETA_EXTENSIONS'
cpp_args += '-DVK_ENABLE_BETA_EXTENSIONS'
endif
_egl = get_option('egl')
if _egl == 'true'

6
src/gallium/drivers/zink/zink_resource.c
View File

@ -45,7 +45,7 @@
#include "util/os_file.h"
#include "frontend/sw_winsys.h"
#ifndef _WIN32
#if !defined(_WIN32) && !defined(__APPLE__)
#define ZINK_USE_DMABUF
#endif
@ -58,6 +58,10 @@
#define DRM_FORMAT_MOD_LINEAR 0
#endif
#if defined(__APPLE__)
// Source of MVK_VERSION
#include "MoltenVK/vk_mvk_moltenvk.h"
#endif
static bool
equals_ivci(const void *a, const void *b)