Skip to content

Commit 691f182

Browse files
committed
Revert "meson: enforce build of intel-clc with anv/iris"
This reverts commit a512c2a.
1 parent 2143da6 commit 691f182

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

meson.build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,18 @@ with_any_broadcom = [
295295
with_broadcom_vk,
296296
].contains(true)
297297

298-
if get_option('intel-clc') != 'system'
298+
if ['x86_64'].contains(host_machine.cpu_family()) and \
299+
get_option('intel-clc') != 'system'
299300
# Require intel-clc with Anv & Iris (for internal shaders)
300301
with_intel_clc = get_option('intel-clc') == 'enabled' or \
301302
with_intel_vk or with_gallium_iris
302303
else
303304
with_intel_clc = false
304305
endif
305306

306-
with_intel_vk_rt = with_intel_vk and get_option('intel-rt') != 'disabled'
307+
with_intel_vk_rt = with_intel_vk and \
308+
get_option('intel-clc') != 'disabled' and \
309+
get_option('intel-rt') != 'disabled'
307310

308311
with_any_intel = [
309312
with_gallium_crocus,

meson_options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,11 @@ option(
635635
'intel-clc',
636636
type : 'combo',
637637
deprecated: {'true': 'enabled', 'false': 'disabled'},
638-
value : 'auto',
638+
value : 'disabled',
639639
choices : [
640-
'enabled', 'system', 'auto'
640+
'enabled', 'disabled', 'system',
641641
],
642-
description : 'Build the intel-clc compiler or use a system version.'
642+
description : 'Build the intel-clc compiler.'
643643
)
644644

645645
option(

0 commit comments

Comments
 (0)