diff options
| -rw-r--r-- | .gitlab-ci/container/build-directx-headers.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/windows/mesa_deps_build.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab-ci/windows/mesa_deps_d3d.ps1 | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | src/microsoft/ci/gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | subprojects/DirectX-Headers.wrap | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh index a930520ee85..4b89d841776 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.613.1 --depth 1 +git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --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 c1b7265585c..bbb97cf05cd 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20240729-rustc-bump" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240909-pytest" + DEBIAN_BUILD_TAG: "20240910-SDK614" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" @@ -43,7 +43,7 @@ variables: WINDOWS_X64_MSVC_TAG: "20240827-v143" WINDOWS_X64_BUILD_PATH: "windows/x86_64_build" - WINDOWS_X64_BUILD_TAG: "20240827-v143" + WINDOWS_X64_BUILD_TAG: "20240910-SDK614" WINDOWS_X64_TEST_PATH: "windows/x86_64_test" - WINDOWS_X64_TEST_TAG: "20240827-v143" + WINDOWS_X64_TEST_TAG: "20240910-SDK614" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index 270d13c2b86..7fed0208ea3 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.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers +git clone -b v1.614.1 --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/.gitlab-ci/windows/mesa_deps_d3d.ps1 b/.gitlab-ci/windows/mesa_deps_d3d.ps1 index d25b0ab48cc..f76641967a0 100644 --- a/.gitlab-ci/windows/mesa_deps_d3d.ps1 +++ b/.gitlab-ci/windows/mesa_deps_d3d.ps1 @@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps" Write-Host "Downloading DirectX 12 Agility SDK at:" Get-Date -Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.613.2 -OutFile 'agility.zip' +Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.1 -OutFile 'agility.zip' Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility' # Copy Agility SDK into mesa-deps\bin\D3D12 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12' diff --git a/meson.build b/meson.build index f8e84f3c09b..f6142bb11fc 100644 --- a/meson.build +++ b/meson.build @@ -580,7 +580,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.613.0', + version : '>= 1.614.1', fallback : ['DirectX-Headers', 'dep_dxheaders'], required : with_gallium_d3d12 or with_microsoft_vk ) diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index a1a9bf396b0..c589cd25778 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -14,7 +14,7 @@ GALLIUM_DRIVER: d3d12 WGL_DISABLE_ERROR_DIALOGS: "true" D3D12_AGILITY_RELATIVE_PATH: "D3D12\\" - D3D12_AGILITY_SDK_VERSION: 613 + D3D12_AGILITY_SDK_VERSION: 614 .d3d12-test-piglit: extends: diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index 3c588475da7..aa1c81fa4c4 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -36,7 +36,7 @@ test-dozen-deqp: variables: GIT_STRATEGY: none # testing doesn't build anything from source DZN_AGILITY_RELATIVE_PATH: "D3D12\\" - DZN_AGILITY_SDK_VERSION: 613 + DZN_AGILITY_SDK_VERSION: 614 DEQP_FRACTION: 4 script: - . _install/deqp_runner_run.ps1 diff --git a/subprojects/DirectX-Headers.wrap b/subprojects/DirectX-Headers.wrap index 49533dcc24d..cec75f42c8c 100644 --- a/subprojects/DirectX-Headers.wrap +++ b/subprojects/DirectX-Headers.wrap @@ -2,5 +2,5 @@ directory = DirectX-Headers-1.0 url = https://github.com/microsoft/DirectX-Headers.git -revision = v1.613.1 +revision = v1.614.1 depth = 1 |