OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: generalize libclc usage

Browse Source 
So that it's not tied directly to clover.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7034>
This commit is contained in:
Dylan Baker
2020-10-06 10:28:34 -07:00
committed by Marge Bot
parent ed7e962b07
commit 5ffdb1092b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@@ -72,6 +72,7 @@ if with_tools.contains('all')
'xvmc', 'xvmc',
] ]
endif endif
with_clc = false
with_intel_tools = with_tools.contains('intel') or with_tools.contains('intel-ui') with_intel_tools = with_tools.contains('intel') or with_tools.contains('intel-ui')
with_imgui = with_intel_tools or with_vulkan_overlay_layer with_imgui = with_intel_tools or with_vulkan_overlay_layer
@@ -802,15 +803,19 @@ if _opencl != 'disabled'
error('OpenCL Clover implementation requires at least one gallium driver.') error('OpenCL Clover implementation requires at least one gallium driver.')
endif endif
dep_clc = dependency('libclc') with_clc = true
with_gallium_opencl = true with_gallium_opencl = true
with_opencl_icd = _opencl == 'icd' with_opencl_icd = _opencl == 'icd'
else else
dep_clc = null_dep
with_gallium_opencl = false with_gallium_opencl = false
with_opencl_icd = false with_opencl_icd = false
endif endif
dep_clc = null_dep
if with_clc
dep_clc = dependency('libclc')
endif
gl_pkgconfig_c_flags = [] gl_pkgconfig_c_flags = []
if with_platform_x11 if with_platform_x11
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')