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

d3d12: Bump directx-headers dependency to v611.0 for latest video codecs and features

Browse Source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26556>
This commit is contained in:
Sil Vilerino
2023-12-05 08:00:01 -05:00
parent 2ea04ef69b
commit 90b49f16f7
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/build-directx-headers.sh
View File

@@ -7,7 +7,7 @@
set -ex set -ex
git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1 git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
pushd DirectX-Headers pushd DirectX-Headers
meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
meson install -C build meson install -C build

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

@@ -10,7 +10,7 @@ variables:
DEBIAN_BASE_TAG: "2023-11-18-deqp-runner" DEBIAN_BASE_TAG: "2023-11-18-deqp-runner"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "2023-12-01-debian-x86_32-d3d12_2" DEBIAN_BUILD_TAG: "2023-12-05-directx-headers-dep-611"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
@@ -33,7 +33,7 @@ variables:
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_PATH: "windows/x64_build"
WINDOWS_X64_BUILD_TAG: "2023-06-24-agility-711" WINDOWS_X64_BUILD_TAG: "2023-12-07-directx-headers-611"
WINDOWS_X64_TEST_PATH: "windows/x64_test" WINDOWS_X64_TEST_PATH: "windows/x64_test"
WINDOWS_X64_TEST_TAG: "2023-05-30-warp-1.0.7.1" WINDOWS_X64_TEST_TAG: "2023-05-30-warp-1.0.7.1"

2
.gitlab-ci/windows/mesa_deps_build.ps1
View File

@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
Get-Date Get-Date
Write-Host "Cloning DirectX-Headers" Write-Host "Cloning DirectX-Headers"
git clone -b v1.711.3-preview --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers git clone -b v1.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
if (!$?) { if (!$?) {
Write-Host "Failed to clone DirectX-Headers repository" Write-Host "Failed to clone DirectX-Headers repository"
Exit 1 Exit 1

2
meson.build
View File

@@ -562,7 +562,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.610.0', version : '>= 1.611.0',
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.610.0 revision = v1.611.0