[Mesa-dev] [PATCH] anv/meson: Generate dev_icd.json

Eric Engestrom eric.engestrom at imgtec.com
Tue Nov 7 15:25:53 UTC 2017


On Wednesday, 2017-11-01 13:49:03 -0700, Chad Versace wrote:
> I tested this in a setup where the builddir was outside of the srcdir.
> ---
>  src/intel/vulkan/meson.build | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
> index ff24e304ef5..e8b7f407507 100644
> --- a/src/intel/vulkan/meson.build
> +++ b/src/intel/vulkan/meson.build
> @@ -48,6 +48,18 @@ intel_icd = custom_target(
>    install : true,
>  )
>  
> +dev_icd = custom_target(
> +  'dev_icd',
> +  input : 'anv_icd.py',
> +  output : 'dev_icd. at 0@.json'.format(target_machine.cpu()),

Strictly speaking, shouldn't that be `host_machine` [1] ?
I don't see how one would do a canadian build of mesa though, so
host == target should always be true.

{intel,radeon}_icd.*.json both also use the 'target_machine' cpu; they
should be fixed as well IMO.

Other than that, looks good to me:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

[1] http://mesonbuild.com/Cross-compilation.html

> +  command : [prog_python2, '@INPUT@',
> +             '--lib-path', meson.current_build_dir(),
> +             '--out', '@OUTPUT@'],
> +  depend_files : files('anv_extensions.py'),
> +  build_by_default : true,
> +  install : false,
> +)
> +
>  # TODO: workaround for anv_entrypoints combining the .h and .c files in it's
>  # output. See issue #2346
>  block_entrypoints = custom_target(
> -- 
> 2.13.0
> 


More information about the mesa-dev mailing list