OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deps: Update DirectX-Headers req to 1.606.4

Browse Source 
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18305>
This commit is contained in:
Jesse Natalie
2022-08-31 12:32:33 -07:00
committed by Marge Bot
parent 91085bf337
commit 1868391732
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
View File

@@ -12,7 +12,7 @@ mkdir -p ~/tmp
pushd ~/tmp pushd ~/tmp
# Building DirectX-Headers # Building DirectX-Headers
git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1 git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --depth 1
mkdir -p DirectX-Headers/build mkdir -p DirectX-Headers/build
pushd DirectX-Headers/build pushd DirectX-Headers/build
meson .. \ meson .. \

2
.gitlab-ci/container/debian/x86_build.sh
View File

@@ -83,7 +83,7 @@ cd shader-db
make make
popd popd
git clone https://github.com/microsoft/DirectX-Headers -b v1.606.3 --depth 1 git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --depth 1
mkdir -p DirectX-Headers/build mkdir -p DirectX-Headers/build
pushd DirectX-Headers/build pushd DirectX-Headers/build
meson .. --backend=ninja --buildtype=release -Dbuild-test=false meson .. --backend=ninja --buildtype=release -Dbuild-test=false

4
.gitlab-ci/image-tags.yml
View File

@@ -3,10 +3,10 @@ variables:
DEBIAN_BASE_TAG: "2022-10-04-vn-render-server" DEBIAN_BASE_TAG: "2022-10-04-vn-render-server"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2022-09-30-mkbootimg" DEBIAN_BUILD_TAG: "2022-10-18-dx-headers"
DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
DEBIAN_BUILD_MINGW_TAG: "2022-10-17-add-libdrm-libva-deps.3" DEBIAN_BUILD_MINGW_TAG: "2022-10-18-dx-headers-va"
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"

2
meson.build
View File

@@ -625,7 +625,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk
dep_dxheaders = dependency('directx-headers', required : false) dep_dxheaders = dependency('directx-headers', required : false)
if not dep_dxheaders.found() if not dep_dxheaders.found()
dep_dxheaders = dependency('DirectX-Headers', dep_dxheaders = dependency('DirectX-Headers',
version : '>= 1.602.0', version : '>= 1.606.4',
fallback : ['DirectX-Headers', 'dep_dxheaders'], fallback : ['DirectX-Headers', 'dep_dxheaders'],
required : with_gallium_d3d12 or with_microsoft_vk required : with_gallium_d3d12 or with_microsoft_vk
) )

2
subprojects/DirectX-Headers.wrap
View File

@@ -2,4 +2,4 @@
directory = DirectX-Headers-1.0 directory = DirectX-Headers-1.0
url = https://github.com/microsoft/DirectX-Headers.git url = https://github.com/microsoft/DirectX-Headers.git
revision = v1.606.3 revision = v1.606.4