1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
From ac503f5d7bf36f021c576029a64ac1a3199f6b5a Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Thu, 31 Aug 2023 13:16:29 -0400
Subject: [PATCH] intel: Allow using intel_clc from the system
With -Dintel-clc=system, the build system will search for an `intel_clc`
binary and use it instead of building `intel_clc` itself.
This allows Intel Vulkan ray tracing support to be built when cross
compiling without terrible hacks (that would otherwise be necessary due
to `intel_clc`'s dependence on SPIRV-LLVM-Translator, libclc, clang, and
LLVM).
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24983>
Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/28c1053c07c177854520f6283fa665f17618adb5]
---
meson.build | 6 +++---
meson_options.txt | 5 ++++-
src/intel/compiler/meson.build | 6 +++++-
src/intel/vulkan/grl/meson.build | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 16e86ec..00a6953 100644
--- a/meson.build
+++ b/meson.build
@@ -259,12 +259,12 @@ endif
with_microsoft_clc = get_option('microsoft-clc').enabled()
if ['x86_64'].contains(host_machine.cpu_family())
- with_intel_clc = get_option('intel-clc').enabled()
- with_intel_vk_rt = with_intel_vk and with_intel_clc
+ with_intel_clc = get_option('intel-clc') == 'enabled'
else
with_intel_clc = false
- with_intel_vk_rt = false
endif
+with_intel_vk_rt = with_intel_vk and get_option('intel-clc') != 'disabled'
+
with_clc = with_microsoft_clc or with_intel_clc
with_libclc = with_clc
with_spirv_to_dxil = get_option('spirv-to-dxil')
diff --git a/meson_options.txt b/meson_options.txt
index 379aea3..9800531 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -607,9 +607,12 @@ option(
option(
'intel-clc',
- type : 'feature',
+ type : 'combo',
deprecated: {'true': 'enabled', 'false': 'disabled'},
value : 'disabled',
+ choices : [
+ 'enabled', 'disabled', 'system',
+ ],
description : 'Build the intel-clc compiler (enables Vulkan Intel ' +
'Ray Tracing on supported hardware).'
)
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 9a03d37..774e955 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -168,7 +168,10 @@ libintel_compiler = static_library(
)
# For now this tool is only going to be used by Anv
-if with_intel_clc
+if get_option('intel-clc') == 'system'
+ prog_intel_clc = find_program('intel_clc', native : true)
+ dep_prog_intel_clc = []
+elif with_intel_clc
prog_intel_clc = executable(
'intel_clc',
['intel_clc.c'],
@@ -181,6 +184,7 @@ if with_intel_clc
dependencies : [idep_nir, idep_clc, idep_mesautil, idep_intel_dev],
native : true,
)
+ dep_prog_intel_clc = [prog_intel_clc]
endif
if with_tests
diff --git a/src/intel/vulkan/grl/meson.build b/src/intel/vulkan/grl/meson.build
index c0056b3..02a72f5 100644
--- a/src/intel/vulkan/grl/meson.build
+++ b/src/intel/vulkan/grl/meson.build
@@ -143,7 +143,7 @@ foreach t : [['125', 'gfx125', 'dg2']]
# if fixed there
],
env: ['MESA_SHADER_CACHE_DISABLE=true'],
- depends : [prog_intel_clc]
+ depends : dep_prog_intel_clc
)
endforeach
|
