Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • mesa mesa
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 2,701
    • Issues 2,701
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 908
    • Merge requests 908
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Mesa
  • mesamesa
  • Merge requests
  • !14255

zink: Fix building on macOS

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Hamish Arblaster requested to merge hamarb123/mesa:main into main Dec 19, 2021
  • Overview 35
  • Commits 1
  • Pipelines 19
  • Changes 2

This commit fixes building of zink on macOS. It is not supposed to guarantee that zink will work flawlessly on macOS.

It fixes it with a new file zink_MVK_VERSION.h that correctly includes MoltenVK/vk_mvk_moltenvk.h (it doesn't include the vulkan headers it needs itself)

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//VulkanSDK//MoltenVK -Dc_std=c11

Please help me through this MR, I haven't contributed to mesa or used gitlab before.

This fixes the build issues in #5736 (closed).

Edited Dec 19, 2021 by Hamish Arblaster
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: main