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

meson: remove opencl-external-clang-headers option and rely on shared-llvm

Browse Source 
Setting opencl-external-clang-headers to enabled while using shared LLVM
was broken and this option was mostly used for windows to force static
inclusion of opencl base headers.

Simply relying on the shared-llvm option here is enough to get what we
want.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568>
This commit is contained in:
Karol Herbst
2024-01-02 22:58:39 +01:00
committed by Marge Bot
parent 501f78fdba
commit 37a1346347
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,6 @@ 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 `

7
meson_options.txt
View File

@@ -200,13 +200,6 @@ option(
description : 'Link libclc SPIR-V statically.', description : 'Link libclc SPIR-V statically.',
) )
option(
'opencl-external-clang-headers',
type : 'feature',
description : 'Use system Clang headers at runtime for OpenCL kernel ' +
'compilation.',
)
option( option(
'd3d-drivers-path', 'd3d-drivers-path',
type : 'string', type : 'string',

4
src/compiler/clc/meson.build
View File

@@ -30,9 +30,7 @@ _libmesaclc_c_args = []
_libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)]
_libmesaclc_sources = [] _libmesaclc_sources = []
if get_option('opencl-external-clang-headers') \ if not _shared_llvm
.disable_auto_if(host_machine.system() == 'windows') \
.disabled()
# LLVM 16 moved clang header path from using full version to only major version # LLVM 16 moved clang header path from using full version to only major version
if dep_llvm.version().version_compare('< 16') if dep_llvm.version().version_compare('< 16')
# Prior to LLVM 16, this path used a full version # Prior to LLVM 16, this path used a full version