diff options
| author | Charlie Turner <cturner@igalia.com> | 2022-01-20 08:15:25 +0000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-06-24 05:32:53 +0000 |
| commit | cec48994cc9b5653ee7cbab3399de47d29d26b74 (patch) | |
| tree | 43345bf7d5424532152711837ecf80fcf2ed3984 | |
| parent | fe649b38c412a07c615eab890c2b252e26c4b559 (diff) | |
ci: upgrade to DXVK v1.10.1
Additionally, improve the building scripts.
Contributed by Andres Gomez.
Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17184>
| -rw-r--r-- | .gitlab-ci/container/debian/x86_test-vk.sh | 39 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 33 insertions, 8 deletions
diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 57026d26e95..dd2ce3a53cf 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -100,15 +100,40 @@ EOF ############### Install DXVK -DXVK_VERSION="1.8.1" +dxvk_install_release() { + local DXVK_VERSION=${1:-"1.10.1"} + + wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz" + tar xzpf dxvk-"${DXVK_VERSION}".tar.gz + "dxvk-${DXVK_VERSION}"/setup_dxvk.sh install + rm -rf "dxvk-${DXVK_VERSION}" + rm dxvk-"${DXVK_VERSION}".tar.gz +} -setup_wine "/dxvk-wine64" +# Install from a Github PR number +dxvk_install_pr() { + local __prnum=$1 + + # NOTE: Clone all the ensite history of the repo so as not to think + # harder about cloning just enough for 'git describe' to work. 'git + # describe' is used by the dxvk build system to generate a + # dxvk_version Meson variable, which is nice-to-have. + git clone https://github.com/doitsujin/dxvk + pushd dxvk + git fetch origin pull/"$__prnum"/head:pr + git checkout pr + ./package-release.sh pr ../dxvk-build --no-package + popd + pushd ./dxvk-build/dxvk-pr + ./setup_dxvk.sh install + popd + rm -rf ./dxvk-build ./dxvk +} -wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz" -tar xzpf dxvk-"${DXVK_VERSION}".tar.gz -dxvk-"${DXVK_VERSION}"/setup_dxvk.sh install -rm -rf dxvk-"${DXVK_VERSION}" -rm dxvk-"${DXVK_VERSION}".tar.gz +# Sets up the WINEPREFIX for the DXVK installation commands below. +setup_wine "/dxvk-wine64" +dxvk_install_release "1.10.1" +#dxvk_install_pr 2359 ############### Install Windows' apitrace binaries diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 60e9a8f0a5e..6495ea008df 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -12,7 +12,7 @@ variables: DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" DEBIAN_X86_TEST_GL_TAG: "2022-06-21-apitrace-linux" - DEBIAN_X86_TEST_VK_TAG: "2022-06-22-gfxreconstruct-0.9.10" + DEBIAN_X86_TEST_VK_TAG: "2022-06-22-dxvk-1.10.1" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" KERNEL_ROOTFS_TAG: "2022-06-21-apitrace-linux" |