Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: Check for bundled Vulkan/SPIR-V headers #3836

Merged
merged 1 commit into from
Mar 6, 2024
Merged

meson: Check for bundled Vulkan/SPIR-V headers #3836

merged 1 commit into from
Mar 6, 2024

Conversation

flibitijibibo
Copy link
Contributor

@flibitijibibo flibitijibibo commented Feb 5, 2024

This is at least enough to use the system headers when building from the tarball, but doesn't check for any version requirements. While imperfect, it's an improvement on the current solution which is to sed -i meson.build, which is sort of overkill...

Partially fixes #3322

@misyltoad
Copy link
Collaborator

There is no reason to ever use system headers for DXVK

@flibitijibibo
Copy link
Contributor Author

There is exactly one reason, and it's one only distributors care about: When building packages they have to use release tarballs, and GitHub still doesn't include the submodules. If dxvk had a custom archive for each release that mimics a recursive clone and trims out all the .git files, that would obsolete this change. (FNA does this, it's not too painful to automate)

@flibitijibibo
Copy link
Contributor Author

For completion's sake, this is the FNA "archivinate.sh" script:

#!/bin/bash

set -ex

cd "`dirname "$0"`"

git clone --recursive https://github.com/FNA-XNA/FNA
rm -rfv FNA/.git* FNA/lib/*/.git* FNA/lib/FNA3D/*/.git*

This could totally be made into a generic script by reading .gitmodules files recursively, but for projects that know their submodule tree a quick script like this does the job!

…the include list.

This feature requires Meson 0.58 or newer.
@doitsujin doitsujin merged commit 4b0e311 into doitsujin:master Mar 6, 2024
3 checks passed
@flibitijibibo flibitijibibo deleted the vulkan-includes branch March 6, 2024 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use system SPIRV and Vulkan headers if new enough
3 participants