Commit Graph

56 Commits

Author SHA1 Message Date
Kira Bruneau
d8a1ddf253
meson: Add vulkan_datadir option (#522)
This option enables using system Vulkan headers when it doesn't share
the same datadir as MangoHud. This is specifically an issue in NixOS
where packages are built into their own isolated directories in
/nix/store.

For example:
/nix/store/9g28nz6zh484144mzw670bx82y1ka49a-vulkan-headers-1.2.162.0/share/vulkan/registry/vk.xml

This is currently worked around in the Nix package, by symlinking the
vulkan-headers into MangoHud's install directory:

5debc57760/pkgs/tools/graphics/mangohud/default.nix (L66-L70)

Although, this hack causes the vulkan-headers to be included as a
runtime dependency when they're only needed at build time.

I tried to figure out a way to resolve the datadir automatically, but
found that just adding a new option is probably the best solution for
the following reasons:

- The vulkan.pc file used to resolve dep_vulkan doesn't contain any
information about the datadir.

- The share directory could be resolved relative to the vulkan include
directory and that would solve the specific issue for Nix, but the
datadir could be installed anywhere and that wouldn't be a general
solution.

- I couldn't find a way to resolve the data dir using the XDG Base
Directory Specification because meson doesn't provide a way to access
the necessary environment variables.

https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
2021-05-11 18:44:25 +03:00
flightlessmango
af57e0cb2d
Merge pull request #445 from stephanlachnit/p/build-source-rework
imgui wrap from WrapDB and build-source.sh rework
2021-02-04 19:45:15 +01:00
flightlessmango
206c55ef2e Bump version to v0.6.2 2021-02-03 16:16:56 +01:00
Stephan Lachnit
b0ee2f749c
imgui wrap from Wrap DB and build-source.sh rework
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2021-02-03 11:13:52 +01:00
jackun
53cca5e723
Merge remote-tracking branch 'origin/master' into develop 2021-02-03 10:37:01 +02:00
Aidan Harris
0a29c7369a
Explicitly test for the mako python module
Some distros (Gentoo) support multiple versions of python3 and mako may
not be built for all of the implementations. Testing for the module
early will make sure meson bails out if the module cannot be
found.
2020-12-27 20:58:55 +00:00
FlightlessMango
90ce1c5778 ImGui wrap 2020-12-18 16:14:05 +01:00
jackun
7b59095a79
Bump to v0.6.1 2020-11-29 16:30:07 +02:00
FlightlessMango
1c9e533a51 Bump meson build to 0.6.0 2020-11-29 03:08:40 +01:00
FlightlessMango
1263b8d954 Build with windows_deps 2020-09-06 07:50:31 +02:00
FlightlessMango
9391822da5 Basic d3d12 present hook 2020-09-05 11:16:20 +02:00
FlightlessMango
b7aa6a997b Separate unix and windows in meson 2020-09-05 07:42:39 +02:00
FlightlessMango
6da5622002 Add minhook dep in meson 2020-09-05 07:42:15 +02:00
jackun
c630588d22
Update version in meson.build 2020-08-23 11:59:24 +03:00
Stephan Lachnit
1f41652061 add a man page for mangohud
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-07-25 19:39:21 +03:00
Stephan Lachnit
acf2d88fbc Import Dear ImGui files as subproject
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-07-09 00:55:10 +03:00
jackun
5fe5ac5f3d
Build script and fixes for Steam Runtime SDK 2020-06-29 17:30:45 +03:00
jackun
0d03b5a150
meson: use gnu_symbol_visibility argument
This uses a meson builtin to handle -fvisibility=hidden.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>
2020-06-21 22:55:13 +03:00
Stephan Lachnit
d956f60f86 remove old system nvml build option
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-06-12 13:37:12 +03:00
Stephan Lachnit
ae8d387998 Use vulkan-headers 1.2.142 from Warp DB
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-06-10 10:20:12 +02:00
FlightlessMango
91ba6fa824 Bump version to 0.4.0 2020-06-10 08:34:30 +02:00
FlightlessMango
f48c09e607 Bump version to 0.3.5 2020-05-02 20:04:31 +02:00
FlightlessMango
e170e64f9c [Params] Version option 2020-05-02 18:39:39 +02:00
FlightlessMango
5ee573730a Removed obsolete license from meson.build files 2020-05-02 17:13:04 +02:00
jackun
efed107af6
[meson] check void* size once and better-ish xnvctrl checks 2020-04-15 19:45:59 +03:00
FlightlessMango
d6314da8b2 Merge branch 'master' into develop 2020-04-11 22:49:50 +02:00
Stephan Lachnit
f860418e7e
Allow system NVML to be used
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-04-10 11:33:58 +02:00
jackun
8024736253
Add DBus loader, combined ticker for Spotify metadata 2020-04-04 23:50:57 +03:00
FlightlessMango
d975278396
Dbus with spotify 2020-04-04 20:51:53 +03:00
Stephan Lachnit
0998d33d72
Use Vulkan-Headers module via wrap
This commit replaces the git submodule for the Vulkan headers with meson subproject using wrap.

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-04-04 17:49:02 +03:00
jackun
2f034c6d1e
Use X11 loader functions instead of linking to X11 libs 2020-04-02 03:09:49 +03:00
Danilo Spinella
0373383581
Add x11/wayland feature switches, rename 'use_xnvctrl' to 'with_xnvctrl' 2020-04-01 11:39:57 +03:00
jackun
82243bf115
Use more general sizeof to get arch "bitness" 2020-03-23 23:22:22 +02:00
jackun
2ab386d70a
Fix double definition 2020-03-23 21:19:03 +02:00
FlightlessMango
43d5bac40d Set MANGOHUD_ARCH in meson 2020-03-23 20:12:02 +01:00
jackun
ab9c9ea7ea
Meson recommends using 'threads' dependency instead of 'pthread' 2020-03-22 02:44:17 +02:00
jackun
65f5ae773d
Bump to v0.3.1 2020-03-18 18:28:44 +02:00
jackun
c2fb89ace5 Bump to v0.3.0 2020-03-14 18:07:53 +02:00
jackun
ad64bf345d
Update build scripts, again
Install to $prefix$libdir/mangohud by default.
2020-03-14 12:59:43 +02:00
FlightlessMango
62a3759d07 only add ld.so.conf file for build.sh 2020-03-12 09:24:36 +01:00
FlightlessMango
8599484032 configure .json files with meson 2020-03-12 08:24:37 +01:00
jackun
f99129f9de
Libdirs: once more, with feeling 2020-03-11 18:11:35 +02:00
jackun
b91be85ff9
Use std::unordered_map and std::mutex instead for object mapping and related cleanups 2020-02-20 01:03:35 +02:00
jackun
70d0e81c36
Clone vulkan headers if needed 2020-02-13 23:53:56 +02:00
Danilo Spinella
18edd4eb50 meson: Add option to use system vulkan headers 2020-02-13 21:47:50 +02:00
Danilo Spinella
2c6f9d0d44 meson: Remove generation of unneeded includes
vk_dispatch_table_helper.h and vk_layer_dispatch_table.h headers
are not used anymore by mesa layer, remove their generation.

Remove git modules required only for the generation of above headers.
2020-02-13 21:47:50 +02:00
jackun
6400ab3cdc
meson: option to add _GLIBCXX_ASSERTIONS define 2020-02-04 23:23:01 +02:00
telans
dacfe111cc
Merge branch 'nvml_headers' 2020-01-31 04:57:50 +00:00
jackun
bf63aaf772
Add Vulkan-Headers submodule 2020-01-30 21:31:18 +02:00
jackun
d71dbdddbf
Keep null_dep global 2020-01-30 21:23:47 +02:00