mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-12-15 08:03:30 -08:00
ci: Run Linux tests on Debian trixie.
So we have a more recent version of SPIRV-Tools and also don't have to recompile Mesa to test llvmpipe. This fixes a few failing tests, but also breaks a couple.
This commit is contained in:
committed by
Henri Verbeet
parent
3f1de27283
commit
3c8b4ce731
Notes:
Henri Verbeet
2025-10-03 00:55:50 +02:00
Approved-by: Henri Verbeet (@hverbeet) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1764
@@ -8,12 +8,6 @@ WORKDIR /tmp
|
||||
# we also have to drop the executables, but we don't care about those
|
||||
# anyway.
|
||||
|
||||
# Mesa requires Meson >= 1.1.0, which is not available on Debian bookworm.
|
||||
# Fortunately that can be worked around by removing some features from
|
||||
# meson.build, which are not needed for llvmpipe. Notice that we use
|
||||
# "git show | patch -R" instead of "git revert" so we don't have to configure
|
||||
# a valid email and user name for git.
|
||||
|
||||
RUN export DEBIAN_FRONTEND=noninteractive; \
|
||||
echo 'path-exclude=/usr/share/doc/*' > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
|
||||
echo 'path-exclude=/usr/share/locale/*' >> /etc/dpkg/dpkg.cfg.d/99-exclude-cruft && \
|
||||
@@ -29,8 +23,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
|
||||
apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \
|
||||
mingw-w64-tools autoconf automake libtool flex bison curl \
|
||||
git ca-certificates rsync \
|
||||
llvm-15-dev meson ninja-build python3-mako \
|
||||
zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \
|
||||
doxygen doxygen-latex graphviz \
|
||||
mesa-vulkan-drivers mesa-vulkan-drivers:i386 \
|
||||
vulkan-tools spirv-headers \
|
||||
@@ -77,17 +69,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
|
||||
dpkg -i spirv-tools_*.deb && \
|
||||
rm -fr * && \
|
||||
|
||||
git clone --branch mesa-24.2.4 https://gitlab.freedesktop.org/mesa/mesa.git && \
|
||||
cd mesa && \
|
||||
git show 876db9135048 | patch -p1 -R && \
|
||||
sed -i -e '981,991d' meson.build && \
|
||||
mkdir build && \
|
||||
cd build && \
|
||||
meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \
|
||||
meson install && \
|
||||
cd ../.. && \
|
||||
rm -fr mesa && \
|
||||
|
||||
apt-get clean && \
|
||||
curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/linux_dxc_2025_02_20.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \
|
||||
groupadd host-render -g 800 && \
|
||||
|
||||
Reference in New Issue
Block a user