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

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

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

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16671>
This commit is contained in:
Yonggang Luo
2022-04-30 12:23:11 +08:00
committed by Marge Bot
parent 29baa326b9
commit 5ac12eeebd
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/build/gitlab-ci.yml
View File

@@ -72,6 +72,7 @@ debian-testing:
VULKAN_DRIVERS: "swrast,amd,intel" VULKAN_DRIVERS: "swrast,amd,intel"
BUILDTYPE: "debugoptimized" BUILDTYPE: "debugoptimized"
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true
-D valgrind=false -D valgrind=false
MINIO_ARTIFACT_NAME: mesa-amd64 MINIO_ARTIFACT_NAME: mesa-amd64
script: 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" GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
VULKAN_DRIVERS: swrast VULKAN_DRIVERS: swrast
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true
-D osmesa=true -D osmesa=true
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,xvmc,lima,panfrost,asahi -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,xvmc,lima,panfrost,asahi
script: script:
@@ -187,6 +189,7 @@ debian-release:
VULKAN_DRIVERS: "amd,imagination-experimental" VULKAN_DRIVERS: "amd,imagination-experimental"
BUILDTYPE: "release" BUILDTYPE: "release"
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true
-D osmesa=true -D osmesa=true
-D tools=all -D tools=all
-D intel-clc=enabled -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" 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 VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,swrast,panfrost,imagination-experimental
EXTRA_OPTIONS: EXTRA_OPTIONS:
-D spirv-to-dxil=true
-D imagination-srv=true -D imagination-srv=true
CC: clang CC: clang
CXX: clang++ CXX: clang++
@@ -519,6 +523,7 @@ debian-mingw32-x86_64:
CPP_ARGS: $C_ARGS CPP_ARGS: $C_ARGS
GALLIUM_DRIVERS: "swrast" GALLIUM_DRIVERS: "swrast"
EXTRA_OPTION: > EXTRA_OPTION: >
-D spirv-to-dxil=true
-Dllvm=disabled -Dllvm=disabled
-Dzlib=disabled -Dzlib=disabled
-Dosmesa=true -Dosmesa=true