mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: enforce build of intel-clc with anv/iris

Browse Source 
If we do a native build, regardless of the host architecture and we
build Anv or Iris, we need intel-clc. So force building that tool.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10601
Fixes: b52e25d3a8 ("anv: rewrite internal shaders using OpenCL")
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27593>
This commit is contained in:
Lionel Landwerlin 2024-02-13 11:36:17 +02:00 committed by Marge Bot
parent d0fba810b3
commit a512c2a8b5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -295,8 +295,7 @@ with_any_broadcom = [
with_broadcom_vk,
].contains(true)
if ['x86_64'].contains(host_machine.cpu_family()) and \
get_option('intel-clc') != 'system'
if get_option('intel-clc') != 'system'
# Require intel-clc with Anv & Iris (for internal shaders)
with_intel_clc = get_option('intel-clc') == 'enabled' or \
with_intel_vk or with_gallium_iris
@ -304,9 +303,7 @@ else
with_intel_clc = false
endif
with_intel_vk_rt = with_intel_vk and \
get_option('intel-clc') != 'disabled' and \
get_option('intel-rt') != 'disabled'
with_intel_vk_rt = with_intel_vk and get_option('intel-rt') != 'disabled'
with_any_intel = [
with_gallium_crocus,

6
meson_options.txt
View File

@ -635,11 +635,11 @@ option(
'intel-clc',
type : 'combo',
deprecated: {'true': 'enabled', 'false': 'disabled'},
value : 'disabled',
value : 'auto',
choices : [
'enabled', 'disabled', 'system',
'enabled', 'system', 'auto'
],
description : 'Build the intel-clc compiler.'
description : 'Build the intel-clc compiler or use a system version.'
)
option(