Re: [Mesa-dev] [PATCH 1/8] meson: Use consistent style

2018-01-09 Thread Eric Engestrom 
On Friday, 2018-01-05 15:40:20 -0800, Dylan Baker wrote:
> Currently the meosn build has a mix of two styles:
> arg : [foo, ...
>bar],
> 
> and
> arg :[
   ^
Missing space

Other than that, the series is:
Acked-by: Eric Engestrom 

>   foo, ...,
>   bar,
> ]
> 
> For consistency let's pick one. I've picked the later style, which I
> think is more readable, and is more common in the mesa code base.
> 
> Signed-off-by: Dylan Baker 
> ---
>  src/amd/addrlib/meson.build   |  9 ++-
>  src/amd/common/meson.build| 10 +--
>  src/amd/vulkan/meson.build| 32 +
>  src/broadcom/meson.build  |  5 +-
>  src/compiler/glsl/glcpp/meson.build   |  6 +-
>  src/compiler/glsl/meson.build |  6 +-
>  src/gallium/drivers/freedreno/meson.build |  6 +-
>  src/glx/meson.build   |  5 +-
>  src/intel/compiler/meson.build|  6 +-
>  src/intel/vulkan/meson.build  | 82 +++-
>  src/mapi/es1api/meson.build   |  6 +-
>  src/mapi/es2api/meson.build   |  6 +-
>  src/mapi/shared-glapi/meson.build |  6 +-
>  src/mesa/drivers/dri/i965/meson.build | 23 ---
>  src/mesa/drivers/dri/meson.build  | 11 +--
>  src/meson.build   |  8 +-
>  src/vulkan/util/meson.build   |  6 +-
>  17 files changed, 148 insertions(+), 85 deletions(-)
> 
> diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
> index ed0dde6..1d16ba8 100644
> --- a/src/amd/addrlib/meson.build
> +++ b/src/amd/addrlib/meson.build
> @@ -53,8 +53,11 @@ files_addrlib = files(
>  libamdgpu_addrlib = static_library(
>'addrlib',
>files_addrlib,
> -  include_directories : include_directories(
> -'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
> -'../common', '../../'),
> +  include_directories : [
> +include_directories(
> +  'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
> +  '../common', '../../',
> +),
> +  ],
>cpp_args : cpp_vis_args,
>  )
> diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
> index 63c1517..43a633a 100644
> --- a/src/amd/common/meson.build
> +++ b/src/amd/common/meson.build
> @@ -53,10 +53,12 @@ amd_common_files = files(
>  libamd_common = static_library(
>'amd_common',
>[amd_common_files, sid_tables_h, nir_opcodes_h],
> -  include_directories : [inc_common, inc_compiler, inc_nir, inc_mesa, 
> inc_mapi,
> - inc_amd],
> -  dependencies : [dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu,
> -  dep_valgrind],
> +  include_directories : [
> +inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi, inc_amd,
> +  ],
> +  dependencies : [
> +dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
> +  ],
>c_args : [c_vis_args],
>cpp_args : [cpp_vis_args],
>  )
> diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
> index 9399735..054ee5e 100644
> --- a/src/amd/vulkan/meson.build
> +++ b/src/amd/vulkan/meson.build
> @@ -22,8 +22,10 @@ radv_entrypoints = custom_target(
>'radv_entrypoints.[ch]',
>input : ['radv_entrypoints_gen.py', vk_api_xml],
>output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
> -  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--outdir', meson.current_build_dir()],
> +  command : [
> +prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
> +meson.current_build_dir()
> +  ],
>depend_files : files('radv_extensions.py'),
>  )
>  
> @@ -31,8 +33,9 @@ radv_extensions_c = custom_target(
>'radv_extensions.c',
>input : ['radv_extensions.py', vk_api_xml],
>output : ['radv_extensions.c'],
> -  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
> - '--out', '@OUTPUT@'],
> +  command : [
> +prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out', '@OUTPUT@',
> +  ],
>  )
>  
>  vk_format_table_c = custom_target(
> @@ -111,13 +114,20 @@ endif
>  
>  libvulkan_radeon = shared_library(
>'vulkan_radeon',
> -  [libradv_files, radv_entrypoints, radv_extensions_c, 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,
> -   libvulkan_wsi, libnir, libmesa_util],
> -  dependencies : [dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl,
> -  dep_m, dep_valgrind],
> +  [libradv_files, radv_entrypoints, radv_extensions_c, 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, libvulkan_wsi,

[Mesa-dev] [PATCH 1/8] meson: Use consistent style

2018-01-05 Thread Dylan Baker 
Currently the meosn build has a mix of two styles:
arg : [foo, ...
   bar],

and
arg :[
  foo, ...,
  bar,
]

For consistency let's pick one. I've picked the later style, which I
think is more readable, and is more common in the mesa code base.

Signed-off-by: Dylan Baker 
---
 src/amd/addrlib/meson.build   |  9 ++-
 src/amd/common/meson.build| 10 +--
 src/amd/vulkan/meson.build| 32 +
 src/broadcom/meson.build  |  5 +-
 src/compiler/glsl/glcpp/meson.build   |  6 +-
 src/compiler/glsl/meson.build |  6 +-
 src/gallium/drivers/freedreno/meson.build |  6 +-
 src/glx/meson.build   |  5 +-
 src/intel/compiler/meson.build|  6 +-
 src/intel/vulkan/meson.build  | 82 +++-
 src/mapi/es1api/meson.build   |  6 +-
 src/mapi/es2api/meson.build   |  6 +-
 src/mapi/shared-glapi/meson.build |  6 +-
 src/mesa/drivers/dri/i965/meson.build | 23 ---
 src/mesa/drivers/dri/meson.build  | 11 +--
 src/meson.build   |  8 +-
 src/vulkan/util/meson.build   |  6 +-
 17 files changed, 148 insertions(+), 85 deletions(-)

diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index ed0dde6..1d16ba8 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -53,8 +53,11 @@ files_addrlib = files(
 libamdgpu_addrlib = static_library(
   'addrlib',
   files_addrlib,
-  include_directories : include_directories(
-'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
-'../common', '../../'),
+  include_directories : [
+include_directories(
+  'core', 'inc/chip/gfx9', 'inc/chip/r800', 'gfx9/chip', 'r800/chip',
+  '../common', '../../',
+),
+  ],
   cpp_args : cpp_vis_args,
 )
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index 63c1517..43a633a 100644
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -53,10 +53,12 @@ amd_common_files = files(
 libamd_common = static_library(
   'amd_common',
   [amd_common_files, sid_tables_h, nir_opcodes_h],
-  include_directories : [inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi,
- inc_amd],
-  dependencies : [dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu,
-  dep_valgrind],
+  include_directories : [
+inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi, inc_amd,
+  ],
+  dependencies : [
+dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
+  ],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
 )
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 9399735..054ee5e 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -22,8 +22,10 @@ radv_entrypoints = custom_target(
   'radv_entrypoints.[ch]',
   input : ['radv_entrypoints_gen.py', vk_api_xml],
   output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--outdir', meson.current_build_dir()],
+  command : [
+prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
+meson.current_build_dir()
+  ],
   depend_files : files('radv_extensions.py'),
 )
 
@@ -31,8 +33,9 @@ radv_extensions_c = custom_target(
   'radv_extensions.c',
   input : ['radv_extensions.py', vk_api_xml],
   output : ['radv_extensions.c'],
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
- '--out', '@OUTPUT@'],
+  command : [
+prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out', '@OUTPUT@',
+  ],
 )
 
 vk_format_table_c = custom_target(
@@ -111,13 +114,20 @@ endif
 
 libvulkan_radeon = shared_library(
   'vulkan_radeon',
-  [libradv_files, radv_entrypoints, radv_extensions_c, 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,
-   libvulkan_wsi, libnir, libmesa_util],
-  dependencies : [dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl,
-  dep_m, dep_valgrind],
+  [libradv_files, radv_entrypoints, radv_extensions_c, 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, libvulkan_wsi, libnir,
+libmesa_util,
+  ],
+  dependencies : [
+dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
+dep_valgrind,
+  ],
   c_args : [c_vis_args, no_override_init_args, radv_flags],
   link_args : [ld_args_bsymbolic, ld_args_gc_sections],
   install : true,
diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 6072fd1..f2a5e53 100644
--- a/src/broadcom/meson.build
+++