[Mesa-dev] [PATCH mesa] meson: add missing radv_extensions.c generation for libvulkan_radeon

[Eric Engestrom]

On Tuesday, 2017-10-17 14:55:06 +0000, Andres Gomez wrote:
> On Tue, 2017-10-17 at 12:00 +0100, Eric Engestrom wrote:
> > Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
> 
> I would add a line like:
> 
> fixes: 17201a2eb0b (radv: port to using updated anv entrypoint/extension generator.)

Thanks, I forgot to do that.

> 
> > ---
> >  src/amd/vulkan/meson.build | 10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> > 
> > diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
> > index a5a4f81352807beac92d..6a416d988674504281c6 100644
> > --- a/src/amd/vulkan/meson.build
> > +++ b/src/amd/vulkan/meson.build
> > @@ -26,6 +26,14 @@ radv_entrypoints = custom_target(
> >               '--outdir', meson.current_build_dir()],
> 
> Since radv_entrypoints_gen.py depends on it and it is also explicit in
> the Makefile.am, I think we should also add something like this here:
> 
> depend_files : files('radv_extensions.py'),

I'll send a separate patch for this, as it's unrelated to the break
fixed here, but good catch, I didn't think to check inside the scripts.

Dylan, meson tracks includes in C files automatically, right? As in,
a file including foo.h would get rebuilt if foo.h is touched, right?
Any idea if the same is/can be done for python files?

> 
> >  )
> >  
> > +radv_extensions = custom_target(
> > +  'radv_extensions.c',
> > +  input : ['radv_extensions.py', vk_api_xml],
> > +  output : ['radv_extensions.c'],
> > +  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> > +             '--out', '@OUTPUT@'],
> > +)
> > +
> >  vk_format_table_c = custom_target(
> >    'vk_format_table.c',
> >    input : ['vk_format_table.py', 'vk_format_layout.csv'],
> > @@ -102,7 +110,7 @@ endif
> >  
> >  libvulkan_radeon = shared_library(
> >    'vulkan_radeon',
> > -  [libradv_files, radv_entrypoints, nir_opcodes_h, vk_format_table_c],
> > +  [libradv_files, radv_entrypoints, radv_extensions, nir_opcodes_h, vk_format_table_c],
> >    include_directories : [inc_common, inc_amd, inc_amd_common, inc_compiler,
> >                           inc_vulkan_util, inc_vulkan_wsi],
> >    link_with : [libamd_common, libamdgpu_addrlib, libvulkan_util,
> 
> Other than that, this is:
> 
> Reviewed-by: Andres Gomez <agomez at igalia.com>
> 
> -- 
> Br,
> 
> Andres