fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

d3d12/dzn/spirv2dxil: Require version library

Browse source 
Fixes: b8328c9 ("microsoft/compiler: Blacklist DXIL validator 1.6 from 20348 SDK")

Closes: #6952

Closes: #6959

v2: Always lookup version library on Windows

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17837>
(cherry picked from commit ec46a85c4f)
This commit is contained in:
pal1000 2022-08-01 19:14:19 +03:00 • committed by Dylan Baker
parent 081fd3a4f4
commit 5c8aaa70e8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -211,7 +211,7 @@
"description": "d3d12/dzn/spirv2dxil: Require version library", "description": "d3d12/dzn/spirv2dxil: Require version library",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "b8328c9664ed3f11924be37a243464236812a3a2" "because_sha": "b8328c9664ed3f11924be37a243464236812a3a2"
}, },

2
meson.build
View file

@ -1884,7 +1884,7 @@ endif
# Be explicit about only using this lib on Windows, to avoid picking # Be explicit about only using this lib on Windows, to avoid picking
# up random libs with the generic name 'libversion' # up random libs with the generic name 'libversion'
dep_version = null_dep dep_version = null_dep
if with_opencl_spirv and host_machine.system() == 'windows' if host_machine.system() == 'windows'
dep_version = cpp.find_library('version') dep_version = cpp.find_library('version')
endif endif