[Mesa-dev] [PATCH mesa] meson: simplify omx logic

[Dylan Baker]

Quoting Eric Engestrom (2018-03-12 09:12:33)
> 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 at imgtec.com>
> ---
>  meson.build | 34 ++++++++++++++++------------------
>  1 file changed, 16 insertions(+), 18 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 6a4d2aded7c72bbb1029..0923b86fac8dfd6ad51a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -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=1'
> -    with_gallium_omx = 'bellagio'
> +    _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=1'
> -      with_gallium_omx = 'tizonia'
> -    else
> -      with_gallium_omx = 'disabled'
> +      _omx = 'tizonia'
>      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
>  
>  if with_gallium_omx != 'bellagio'
>    pre_args += '-DENABLE_ST_OMX_BELLAGIO=0'
> -- 
> Cheers,
>   Eric
> 

Thanks for looking at this, I'll admit I was basically trying to fix this as
fast as I could, this looks much nicer,

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180312/92c12e1d/attachment.sig>