[PATCH v4 3/3] ci: Build vkd3d with SPIRV-Tools.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 gitlab/build-linux  |  2 +-
 gitlab/build.yml    |  4 ++--
 gitlab/image.docker | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/gitlab/build-linux b/gitlab/build-linux
index 4a8c793b7..d7e7573f1 100755
--- a/gitlab/build-linux
+++ b/gitlab/build-linux
@@ -12,7 +12,7 @@ rm -fr build
 mkdir build
 cd build
 export LD_LIBRARY_PATH=/usr/local/lib
-if ../configure --enable-demos DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \
+if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \
         make -j$(nproc) ; then
     make -j$(nproc) check || \
         touch ../tests_failed
diff --git a/gitlab/build.yml b/gitlab/build.yml
index 9695a3042..9a19316b5 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -48,7 +48,7 @@ build-radv-32:
     - amd-gpu
   variables:
     VK_LOADER_DRIVERS_SELECT: 'radeon_*'
-    CC: 'gcc -m32'
+    CC: 'i686-linux-gnu-gcc'
     VKD3D_SHADER_CONFIG: 'force_validation'

build-llvmpipe-32:
@@ -58,7 +58,7 @@ build-llvmpipe-32:
       - 2
   variables:
     VK_LOADER_DRIVERS_SELECT: 'lvp_*'
-    CC: 'gcc -m32'
+    CC: 'i686-linux-gnu-gcc'
     VKD3D_SHADER_CONFIG: 'force_validation'

build-crosstest:
diff --git a/gitlab/image.docker b/gitlab/image.docker
index 9b7b17b09..270c509ba 100644
--- a/gitlab/image.docker
+++ b/gitlab/image.docker
@@ -2,6 +2,12 @@

WORKDIR /tmp

+# Package spirv-tools from Debian has two problems for us: first, it
+# doesn't have shared libraries; second, it's not multiarch. So we
+# have to rebuild it with some tweaks. In order to make it multiarch
+# we also have to drop the executables, but we don't care about those
+# anyway.
+
 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 && \
@@ -11,9 +17,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     echo 'exit 101' >> /usr/sbin/policy-rc.d && \
     chmod +x /usr/sbin/policy-rc.d && \
     dpkg --add-architecture i386 && \
+    sed -i -e 's|Types: deb|Types: deb deb-src|g' /etc/apt/sources.list.d/* && \
     apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y build-essential pkg-config gcc-multilib gcc-mingw-w64 \
+    apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \
                        autoconf automake libtool flex bison curl \
                        git ca-certificates rsync \
                        doxygen doxygen-latex graphviz \
@@ -27,6 +34,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
                        libxcb-util-dev libxcb-util-dev:i386 \
                        libxcb-icccm4-dev libxcb-icccm4-dev:i386 \
                        libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \
+    apt-get build-dep -y spirv-tools && \
+    apt-get build-dep -y -ai386 spirv-tools && \
     git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \
     cd wine && \
     mkdir build && \
@@ -36,6 +45,26 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     cp tools/widl/widl /usr/local/bin && \
     cd ../.. && \
     rm -rf wine && \
+    apt-get source spirv-tools && \
+    cd spirv-tools-* && \
+    sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
+    sed -i -e 's|dh_install$|dh_install && rm debian/spirv-tools/usr/bin/*|g' debian/rules && \
+    sed -i '/Architecture: any/a Multi-Arch: same' debian/control && \
+    dpkg-buildpackage -uc -us && \
+    cd .. && \
+    rm -f spirv-tools-dbgsym_*.deb && \
+    dpkg -i spirv-tools_*.deb && \
+    rm -fr * && \
+    apt-get source spirv-tools && \
+    cd spirv-tools-* && \
+    sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
+    sed -i -e 's|dh_install$|dh_install && rm debian/spirv-tools/usr/bin/*|g' debian/rules && \
+    sed -i '/Architecture: any/a Multi-Arch: same' debian/control && \
+    CONFIG_SITE=/etc/dpkg-cross/cross-config.amd64 DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -ai386 -Pcross,nocheck -uc -us && \
+    cd .. && \
+    rm -f spirv-tools-dbgsym_*.deb && \
+    dpkg -i spirv-tools_*.deb && \
+    rm -fr * && \
     apt-get clean && \
     curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.23... | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \
     groupadd host-render -g 800 && \