|
|
1
|
+diff --git a/meson.build b/meson.build
|
|
|
2
|
+index 9153910e8a4..69d537361cd 100644
|
|
|
3
|
+--- a/meson.build
|
|
|
4
|
++++ b/meson.build
|
|
|
5
|
+@@ -813,7 +813,6 @@ if _opencl != 'disabled'
|
|
|
6
|
+ error('The Clover OpenCL state tracker requires rtti')
|
|
|
7
|
+ endif
|
|
|
8
|
+
|
|
|
9
|
+- with_clc = true
|
|
|
10
|
+ with_gallium_opencl = true
|
|
|
11
|
+ with_opencl_icd = _opencl == 'icd'
|
|
|
12
|
+ else
|
|
|
13
|
+@@ -837,11 +836,6 @@ if with_gallium_rusticl
|
|
|
14
|
+ with_clc = true
|
|
|
15
|
+ endif
|
|
|
16
|
+
|
|
|
17
|
+-dep_clc = null_dep
|
|
|
18
|
+-if with_clc
|
|
|
19
|
+- dep_clc = dependency('libclc')
|
|
|
20
|
+-endif
|
|
|
21
|
+-
|
|
|
22
|
+ gl_pkgconfig_c_flags = []
|
|
|
23
|
+ with_glx_indirect_rendering = false
|
|
|
24
|
+ if with_platform_x11
|
|
|
25
|
+@@ -1811,6 +1805,7 @@ pre_args += '-DLLVM_AVAILABLE=' + (with_llvm ? '1' : '0')
|
|
|
26
|
+ pre_args += '-DDRAW_LLVM_AVAILABLE=' + (with_llvm and draw_with_llvm ? '1' : '0')
|
|
|
27
|
+
|
|
|
28
|
+ with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_clc
|
|
|
29
|
++dep_clc = null_dep
|
|
|
30
|
+ if with_opencl_spirv
|
|
|
31
|
+ chosen_llvm_version_array = dep_llvm.version().split('.')
|
|
|
32
|
+ chosen_llvm_version_major = chosen_llvm_version_array[0].to_int()
|
|
|
33
|
+@@ -1833,6 +1828,7 @@ if with_opencl_spirv
|
|
|
34
|
+ '>= @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor),
|
|
|
35
|
+ '< @0@.@1@'.format(chosen_llvm_version_major, chosen_llvm_version_minor + 1) ]
|
|
|
36
|
+
|
|
|
37
|
++ dep_clc = dependency('libclc')
|
|
|
38
|
+ dep_spirv_tools = dependency('SPIRV-Tools', required : true, version : '>= 2018.0')
|
|
|
39
|
+ # LLVMSPIRVLib is available at https://github.com/KhronosGroup/SPIRV-LLVM-Translator
|
|
|
40
|
+ dep_llvmspirvlib = dependency('LLVMSPIRVLib', required : true, version : _llvmspirvlib_version)
|
|
|
41
|
+diff --git a/src/compiler/meson.build b/src/compiler/meson.build
|
|
|
42
|
+index 1dae56d1b2b..8d73544c6d8 100644
|
|
|
43
|
+--- a/src/compiler/meson.build
|
|
|
44
|
++++ b/src/compiler/meson.build
|
|
|
45
|
+@@ -79,7 +79,7 @@ subdir('nir')
|
|
|
46
|
+
|
|
|
47
|
+ subdir('spirv')
|
|
|
48
|
+
|
|
|
49
|
+-if with_opencl_spirv
|
|
|
50
|
++if with_clc
|
|
|
51
|
+ subdir('clc')
|
|
|
52
|
+ endif
|
|
|
53
|
+ if with_gallium |