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

meson: group libdrm dependencies

Browse Source 
The reason libdrm is after libdrm_* will be made clear in later patches.

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
This commit is contained in:
Dylan Baker
2018-03-12 15:58:40 -07:00
parent e520ca562a
commit acadf06f56
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meson.build
View File

@@ -230,11 +230,6 @@ if with_gallium_tegra and not with_gallium_nouveau
error('tegra driver requires nouveau driver') error('tegra driver requires nouveau driver')
endif endif
dep_libdrm_intel = []
if with_dri_i915 or with_gallium_i915
dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75')
endif
if host_machine.system() == 'darwin' if host_machine.system() == 'darwin'
with_dri_platform = 'apple' with_dri_platform = 'apple'
elif ['windows', 'cygwin'].contains(host_machine.system()) elif ['windows', 'cygwin'].contains(host_machine.system())
@@ -1005,16 +1000,6 @@ else
dep_clock = cc.find_library('rt') dep_clock = cc.find_library('rt')
endif endif
with_gallium_drisw_kms = false
dep_libdrm = dependency('libdrm', version : '>= 2.4.75',
required : with_dri2 or with_dri3)
if dep_libdrm.found()
pre_args += '-DHAVE_LIBDRM'
if with_dri_platform == 'drm' and with_dri
with_gallium_drisw_kms = true
endif
endif
# TODO: some of these may be conditional # TODO: some of these may be conditional
dep_zlib = dependency('zlib', version : '>= 1.2.3') dep_zlib = dependency('zlib', version : '>= 1.2.3')
pre_args += '-DHAVE_ZLIB' pre_args += '-DHAVE_ZLIB'
@@ -1040,6 +1025,10 @@ dep_libdrm_radeon = []
dep_libdrm_nouveau = [] dep_libdrm_nouveau = []
dep_libdrm_etnaviv = [] dep_libdrm_etnaviv = []
dep_libdrm_freedreno = [] dep_libdrm_freedreno = []
dep_libdrm_intel = []
if with_dri_i915 or with_gallium_i915
dep_libdrm_intel = dependency('libdrm_intel', version : '>= 2.4.75')
endif
if with_amd_vk or with_gallium_radeonsi if with_amd_vk or with_gallium_radeonsi
dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.91') dep_libdrm_amdgpu = dependency('libdrm_amdgpu', version : '>= 2.4.91')
endif endif
@@ -1057,6 +1046,16 @@ if with_gallium_freedreno
dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.91') dep_libdrm_freedreno = dependency('libdrm_freedreno', version : '>= 2.4.91')
endif endif
with_gallium_drisw_kms = false
dep_libdrm = dependency('libdrm', version : '>= 2.4.75',
required : with_dri2 or with_dri3)
if dep_libdrm.found()
pre_args += '-DHAVE_LIBDRM'
if with_dri_platform == 'drm' and with_dri
with_gallium_drisw_kms = true
endif
endif
llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit'] llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
llvm_modules += ['amdgpu', 'bitreader', 'ipo'] llvm_modules += ['amdgpu', 'bitreader', 'ipo']