diff options
| -rw-r--r-- | .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/container/debian/x86_build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | subprojects/DirectX-Headers.wrap | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh index e42a65f33ca..dc3dc34e839 100644 --- a/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh +++ b/.gitlab-ci/container/debian/x86_build-mingw-source-deps.sh @@ -12,7 +12,7 @@ mkdir -p ~/tmp pushd ~/tmp # 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 pushd DirectX-Headers/build meson .. \ diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh index afcf13d1d35..2932f983e51 100644 --- a/.gitlab-ci/container/debian/x86_build.sh +++ b/.gitlab-ci/container/debian/x86_build.sh @@ -83,7 +83,7 @@ cd shader-db make 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 pushd DirectX-Headers/build meson .. --backend=ninja --buildtype=release -Dbuild-test=false diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 3be5bdabe7f..8faf36cb888 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -3,10 +3,10 @@ variables: DEBIAN_BASE_TAG: "2022-10-04-vn-render-server" 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_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" diff --git a/meson.build b/meson.build index 3e523ee242a..9f7db50225f 100644 --- a/meson.build +++ b/meson.build @@ -625,7 +625,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.602.0', + version : '>= 1.606.4', 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 0ed14183268..40012e87d71 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.606.3 +revision = v1.606.4 |