From ac10c75ca044a0e85d4f6edf51673540f5e173fc Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Thu, 17 Nov 2022 16:45:42 +0000 Subject: [PATCH] [build] Add Josh's libdisplay-info fork for parsing EDIDs This will be used to parse static HDR metadata and chromaticity of the display. Upstream currently has no Windows or MSVC support so use my fork for now. --- .gitmodules | 4 ++++ meson.build | 3 +++ subprojects/libdisplay-info | 1 + 3 files changed, 8 insertions(+) create mode 160000 subprojects/libdisplay-info diff --git a/.gitmodules b/.gitmodules index 91895ae2..66196752 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,7 @@ [submodule "include/spirv"] path = include/spirv url = https://github.com/KhronosGroup/SPIRV-Headers.git +[submodule "subprojects/libdisplay-info"] + path = subprojects/libdisplay-info + url = https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info + branch = windows diff --git a/meson.build b/meson.build index e417ff67..12d37300 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,9 @@ dxvk_include_dirs = [ './include/spirv/include' ] +proj_displayinfo = subproject('libdisplay-info') +dep_displayinfo = proj_displayinfo.get_variable('di_dep') + if platform == 'windows' compiler_args += [ '-DNOMINMAX', diff --git a/subprojects/libdisplay-info b/subprojects/libdisplay-info new file mode 160000 index 00000000..3b2e9f6b --- /dev/null +++ b/subprojects/libdisplay-info @@ -0,0 +1 @@ +Subproject commit 3b2e9f6b76aa8d0c413c93202e93816517d781bd