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

ci: Disable "opencl-external-clang-headers" when "microsoft-clc" is enabled

Browse Source 
Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23255>
This commit is contained in:
Dor Askayo
2023-05-26 14:54:17 +03:00
committed by Marge Bot
parent a28540a430
commit 7e8e7f0823
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -694,6 +694,7 @@ debian-ppc64el:
-D opencl-spirv=true -D opencl-spirv=true
-D microsoft-clc=enabled -D microsoft-clc=enabled
-D static-libclc=all -D static-libclc=all
-D opencl-external-clang-headers=disabled
-D llvm=enabled -D llvm=enabled
-D gallium-va=enabled -D gallium-va=enabled
-D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec

1
.gitlab-ci/windows/mesa_build.ps1
View File

@@ -59,6 +59,7 @@ meson setup `
-Dopencl-spirv=true ` -Dopencl-spirv=true `
-Dmicrosoft-clc=enabled ` -Dmicrosoft-clc=enabled `
-Dstatic-libclc=all ` -Dstatic-libclc=all `
-Dopencl-external-clang-headers=disabled `
-Dspirv-to-dxil=true ` -Dspirv-to-dxil=true `
-Dbuild-tests=true ` -Dbuild-tests=true `
-Dwerror=true ` -Dwerror=true `