NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

meson: do not pull in clc for clover

Browse source 
Fixes: 01d0d94319 ("meson: Simplify clc expression")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27663>
(cherry picked from commit 815a6647eb1383e9dc704ffcc266d85f3b13338a)
This commit is contained in:
Karol Herbst 2024-02-17 01:45:07 +01:00 • committed by Eric Engestrom
parent c8bdf6129a
commit 21090c8d3e
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1714,7 +1714,7 @@
"description": "meson: do not pull in clc for clover", "description": "meson: do not pull in clc for clover",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "01d0d9431977ac25a191c860cb6711f48e6c173f", "because_sha": "01d0d9431977ac25a191c860cb6711f48e6c173f",
"notes": null "notes": null

3
meson.build
View file

@ -813,7 +813,6 @@ if _opencl != 'disabled'
error('The Clover OpenCL state tracker requires rtti') error('The Clover OpenCL state tracker requires rtti')
endif endif
with_clc = true
with_gallium_opencl = true with_gallium_opencl = true
with_opencl_icd = _opencl == 'icd' with_opencl_icd = _opencl == 'icd'
else else
@ -838,7 +837,7 @@ if with_gallium_rusticl
endif endif
dep_clc = null_dep dep_clc = null_dep
if with_clc if with_gallium_opencl or with_clc
dep_clc = dependency('libclc') dep_clc = dependency('libclc')
endif endif

2
src/compiler/meson.build
View file

@ -79,7 +79,7 @@ subdir('nir')
subdir('spirv') subdir('spirv')
if with_opencl_spirv if with_clc
subdir('clc') subdir('clc')
endif endif
if with_gallium if with_gallium