mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-01-22 05:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: simplify omx logic

Browse Source 
and let's make sure `with_gallium_omx` is never 'auto' and can only be
one of [bellagio, tizonia, disabled].

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Mathias Fröhlich 2018-03-16 06:34:35 +01:00 committed by Eric Engestrom
parent 862c872c48
commit 795b465c50
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meson.build
View File

@ -496,42 +496,40 @@ elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau)
error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.')
endif
endif
with_gallium_omx = _omx
dep_omx = []
dep_omx_other = []
if with_gallium_omx == 'bellagio' or with_gallium_omx == 'auto'
if ['auto', 'bellagio'].contains(_omx)
dep_omx = dependency(
'libomxil-bellagio', required : with_gallium_omx == 'bellagio'
'libomxil-bellagio', required : _omx == 'bellagio'
)
if dep_omx.found()
pre_args += '-DENABLE_ST_OMX_BELLAGIO'
with_gallium_omx = 'bellagio'
endif
endif
if with_gallium_omx == 'tizonia' or with_gallium_omx == 'auto'
if not (with_dri and with_egl)
if with_gallium_omx == 'tizonia'
error('OMX-Tizonia state tracker requires dri and egl')
else
with_gallium_omx == 'disabled'
endif
else
if ['auto', 'tizonia'].contains(_omx)
if with_dri and with_egl
dep_omx = dependency(
'libtizonia', version : '>= 0.10.0',
required : with_gallium_omx == 'tizonia',
required : _omx == 'tizonia',
)
dep_omx_other = [
dependency('libtizplatform', required : with_gallium_omx == 'tizonia'),
dependency('tizilheaders', required : with_gallium_omx == 'tizonia'),
dependency('libtizplatform', required : _omx == 'tizonia'),
dependency('tizilheaders', required : _omx == 'tizonia'),
]
if dep_omx.found() and dep_omx_other[0].found() and dep_omx_other[1].found()
pre_args += '-DENABLE_ST_OMX_TIZONIA'
with_gallium_omx = 'tizonia'
else
with_gallium_omx = 'disabled'
endif
elif _omx == 'tizonia'
error('OMX-Tizonia state tracker requires dri and egl')
endif
endif
if _omx == 'auto'
with_gallium_omx = 'disabled'
else
with_gallium_omx = _omx
endif
omx_drivers_path = get_option('omx-libs-path')
if with_gallium_omx != 'disabled'