Mesa (main): ci: Building spirv-to-dxil on both mingw and debian/x64

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5ac12eeebde702f2d0cc917a03e6deda0aeb7b07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ac12eeebde702f2d0cc917a03e6deda0aeb7b07

Author: Yonggang Luo <luoyonggang at gmail.com>
Date:   Sat Apr 30 12:23:11 2022 +0800

ci: Building spirv-to-dxil on both mingw and debian/x64

debian/i386 needs cross compile of `DirectX-Headers`, so just enable spirv-to-dxil on debian/x64

Signed-off-by: Yonggang Luo <luoyonggang at gmail.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16671>

---

 .gitlab-ci/build/gitlab-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 75e845a3061..541f2dd4ec4 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -72,6 +72,7 @@ debian-testing:
     VULKAN_DRIVERS: "swrast,amd,intel"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D valgrind=false
     MINIO_ARTIFACT_NAME: mesa-amd64
   script:
@@ -156,6 +157,7 @@ debian-gallium:
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
     VULKAN_DRIVERS: swrast
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,xvmc,lima,panfrost,asahi
   script:
@@ -187,6 +189,7 @@ debian-release:
     VULKAN_DRIVERS: "amd,imagination-experimental"
     BUILDTYPE: "release"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=all
       -D intel-clc=enabled
@@ -402,6 +405,7 @@ debian-clang:
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
     VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,swrast,panfrost,imagination-experimental
     EXTRA_OPTIONS:
+      -D spirv-to-dxil=true
       -D imagination-srv=true
     CC: clang
     CXX: clang++
@@ -519,6 +523,7 @@ debian-mingw32-x86_64:
     CPP_ARGS: $C_ARGS
     GALLIUM_DRIVERS: "swrast"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -Dllvm=disabled
       -Dzlib=disabled
       -Dosmesa=true