summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build13
-rw-r--r--meson_options.txt6
-rw-r--r--src/gallium/state_trackers/clover/meson.build9
3 files changed, 26 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index a50f57991da..5509a67fdeb 100644
--- a/meson.build
+++ b/meson.build
@@ -712,6 +712,16 @@ if _opencl != 'disabled'
with_gallium_opencl = true
with_opencl_icd = _opencl == 'icd'
+ with_opencl_spirv = get_option('opencl-spirv')
+ if with_opencl_spirv
+ dep_spirv_tools = dependency('SPIRV-Tools', required : true, version : '>= 2018.0')
+ # LLVMSPIRVLib is available at https://github.com/KhronosGroup/SPIRV-LLVM-Translator
+ dep_llvmspirvlib = dependency('LLVMSPIRVLib', required : true, version : '>= 0.2.1')
+ else
+ dep_spirv_tools = null_dep
+ dep_llvmspirvlib = null_dep
+ endif
+
if host_machine.cpu_family().startswith('ppc') and cpp.compiles('''
#if !defined(__VEC__) || !defined(__ALTIVEC__)
#error "AltiVec not enabled"
@@ -721,8 +731,11 @@ if _opencl != 'disabled'
endif
else
dep_clc = null_dep
+ dep_spirv_tools = null_dep
+ dep_llvmspirvlib = null_dep
with_gallium_opencl = false
with_opencl_icd = false
+ with_opencl_spirv = false
endif
gl_pkgconfig_c_flags = []
diff --git a/meson_options.txt b/meson_options.txt
index a2f86be19ae..3ab2900f929 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -144,6 +144,12 @@ option(
description : 'build gallium "clover" OpenCL state tracker.',
)
option(
+ 'opencl-spirv',
+ type : 'boolean',
+ value : false,
+ description : 'build gallium "clover" OpenCL state tracker with SPIR-V binary support.',
+)
+option(
'd3d-drivers-path',
type : 'string',
value : '',
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,
)