diff options
| author | Pierre Moreau <[email protected]> | 2018-01-21 19:10:58 +0100 |
|---|---|---|
| committer | Karol Herbst <[email protected]> | 2019-09-21 08:28:32 +0000 |
| commit | 866f6f11d928e6e9b1a45468ec9d6cf12b7f2778 (patch) | |
| tree | 2b1653d4895b92ef96de0bb0aedc2d3f8475ea9b /src/gallium | |
| parent | aa7ac32976fbce522cb36455e1c3748a0cddba80 (diff) | |
meson: Check for SPIRV-Tools and llvm-spirv
Changes since:
* v12 (Karol Herbst):
- rename CLOVER_ALLOW_SPIRV to HAVE_CLOVER_SPIRV
* v11 (Karol Herbst):
- only set new defines for clover to speed up recompilation
- remove autotools
* v10:
- Add a new flag (`--enable-opencl-spirv` for autotools, and
`-Dopencl-spirv=true` for meson) for enabling SPIR-V support in
clover, and never automagically enable it without that flag. (Dylan Baker)
- When enabling the SPIR-V support, the SPIRV-Tools and
SPIRV-LLVM-Translator libraries are now required dependencies.
* v7:
- Properly align LLVMSPIRVLib comment (Dylan Baker)
- Only define CLOVER_ALLOW_SPIRV when **both** dependencies are found:
autotools was only requiring one or the other.
* v6: Replace the llvm-spirv repository by the new official
SPIRV-LLVM-Translator.
* v4: Add a comment saying where to find llvm-spirv (Karol Herbst).
* v3:
- make SPIRV-Tools and llvm-spirv optional (Francisco Jerez);
- bump requirement for llvm-spirv to version 0.2
* v2:
- Bump the required version of SPIRV-Tools to the latest release;
- Add a dependency on llvm-spirv.
Reviewed-by: Dylan Baker <[email protected]> (v10)
Reviewed-by: Karol Herbst <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/clover/meson.build | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build index 2ff060bf35b..9e3ec8d5ad4 100644 --- a/src/gallium/state_trackers/clover/meson.build +++ b/src/gallium/state_trackers/clover/meson.build @@ -19,12 +19,17 @@ # SOFTWARE. clover_cpp_args = [] +clover_spirv_cpp_args = [] clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux] if with_opencl_icd clover_cpp_args += '-DHAVE_CLOVER_ICD' endif +if with_opencl_spirv + clover_spirv_cpp_args += '-DHAVE_CLOVER_SPIRV' +endif + libclllvm = static_library( 'clllvm', files( @@ -40,7 +45,7 @@ libclllvm = static_library( ), include_directories : clover_incs, cpp_args : [ - cpp_vis_args, + clover_spirv_cpp_args, cpp_vis_args, '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( @@ -111,7 +116,7 @@ libclover = static_library( 'clover', [clover_files, sha1_h], include_directories : clover_incs, - cpp_args : [clover_cpp_args, cpp_vis_args], + cpp_args : [clover_spirv_cpp_args, clover_cpp_args, cpp_vis_args], link_with : [libclllvm], override_options : clover_cpp_std, ) |