Module: Mesa Branch: main Commit: 90b49f16f7b0e183e5f10eaf2ee76886887175e2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90b49f16f7b0e183e5f10eaf2ee76886887175e2
Author: Sil Vilerino <sivil...@microsoft.com> Date: Tue Dec 5 08:00:01 2023 -0500 d3d12: Bump directx-headers dependency to v611.0 for latest video codecs and features Reviewed-by: Jesse Natalie <jenat...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26556> --- .gitlab-ci/container/build-directx-headers.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- .gitlab-ci/windows/mesa_deps_build.ps1 | 2 +- meson.build | 2 +- subprojects/DirectX-Headers.wrap | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh index e2225e6fb48..702f978136d 100644 --- a/.gitlab-ci/container/build-directx-headers.sh +++ b/.gitlab-ci/container/build-directx-headers.sh @@ -7,7 +7,7 @@ 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 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS meson install -C build diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 403c32b3c8e..129f9b2b9b6 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -10,7 +10,7 @@ variables: DEBIAN_BASE_TAG: "2023-11-18-deqp-runner" 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" @@ -33,7 +33,7 @@ variables: WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" 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_TAG: "2023-05-30-warp-1.0.7.1" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index 8872ae2f585..b360678c29e 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps" Get-Date 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 (!$?) { Write-Host "Failed to clone DirectX-Headers repository" Exit 1 diff --git a/meson.build b/meson.build index af5ab824360..e3560589f83 100644 --- a/meson.build +++ b/meson.build @@ -562,7 +562,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk dep_dxheaders = dependency('directx-headers', required : false) if not dep_dxheaders.found() dep_dxheaders = dependency('DirectX-Headers', - version : '>= 1.610.0', + version : '>= 1.611.0', fallback : ['DirectX-Headers', 'dep_dxheaders'], required : with_gallium_d3d12 or with_microsoft_vk ) diff --git a/subprojects/DirectX-Headers.wrap b/subprojects/DirectX-Headers.wrap index f274eaff991..447fda66839 100644 --- a/subprojects/DirectX-Headers.wrap +++ b/subprojects/DirectX-Headers.wrap @@ -2,4 +2,4 @@ directory = DirectX-Headers-1.0 url = https://github.com/microsoft/DirectX-Headers.git -revision = v1.610.0 +revision = v1.611.0
