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

ci/container: move vkd3d-proton build section into the script itself

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
This commit is contained in:
Eric Engestrom
2024-11-19 21:17:14 +01:00
committed by Marge Bot
parent b791074f2e
commit 5655a30412
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-vkd3d-proton.sh
View File

@@ -6,6 +6,8 @@
# KERNEL_ROOTFS_TAG # KERNEL_ROOTFS_TAG
set -ex set -ex
uncollapsed_section_start vkd3d-proton "Building vkd3d-proton"
VKD3D_PROTON_COMMIT="59d6d4b5ed23766e69fe252408a3401d2fd52ce8" VKD3D_PROTON_COMMIT="59d6d4b5ed23766e69fe252408a3401d2fd52ce8"
VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests" VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
@@ -45,3 +47,5 @@ popd
rm -rf "$VKD3D_PROTON_BUILD_DIR" rm -rf "$VKD3D_PROTON_BUILD_DIR"
rm -rf "$VKD3D_PROTON_SRC_DIR" rm -rf "$VKD3D_PROTON_SRC_DIR"
section_end vkd3d-proton

2
.gitlab-ci/container/debian/test-vk.sh
View File

@@ -120,8 +120,6 @@ DEQP_TARGET=default \
############### Build VKD3D-Proton ############### Build VKD3D-Proton
uncollapsed_section_switch proton "Installing Proton (Wine/D3DVK emulation)"
. .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64" . .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"
. .gitlab-ci/container/build-vkd3d-proton.sh . .gitlab-ci/container/build-vkd3d-proton.sh

4
.gitlab-ci/container/setup-wine.sh
View File

@@ -2,6 +2,8 @@
set -u set -u
uncollapsed_section_start wine "Setting up Wine"
export WINEPREFIX="$1" export WINEPREFIX="$1"
export WINEDEBUG="-all" export WINEDEBUG="-all"
@@ -24,3 +26,5 @@ rm crashdialog.reg
# it a bit more of time for it to be created solves the problem # it a bit more of time for it to be created solves the problem
# ... # ...
while ! test -f "${WINEPREFIX}/system.reg"; do sleep 1; done while ! test -f "${WINEPREFIX}/system.reg"; do sleep 1; done
section_end wine