mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2024-12-02 22:54:05 +08:00
meson: do not pull in clc for clover
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 commit815a6647eb
)
This commit is contained in:
parent
c8bdf6129a
commit
21090c8d3e
@ -1714,7 +1714,7 @@
|
||||
"description": "meson: do not pull in clc for clover",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "01d0d9431977ac25a191c860cb6711f48e6c173f",
|
||||
"notes": null
|
||||
|
@ -813,7 +813,6 @@ if _opencl != 'disabled'
|
||||
error('The Clover OpenCL state tracker requires rtti')
|
||||
endif
|
||||
|
||||
with_clc = true
|
||||
with_gallium_opencl = true
|
||||
with_opencl_icd = _opencl == 'icd'
|
||||
else
|
||||
@ -838,7 +837,7 @@ if with_gallium_rusticl
|
||||
endif
|
||||
|
||||
dep_clc = null_dep
|
||||
if with_clc
|
||||
if with_gallium_opencl or with_clc
|
||||
dep_clc = dependency('libclc')
|
||||
endif
|
||||
|
||||
|
@ -79,7 +79,7 @@ subdir('nir')
|
||||
|
||||
subdir('spirv')
|
||||
|
||||
if with_opencl_spirv
|
||||
if with_clc
|
||||
subdir('clc')
|
||||
endif
|
||||
if with_gallium
|
||||
|
Loading…
Reference in New Issue
Block a user