meson: Use consistent style

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.

v2: - fix commit message

Acked-by: Eric Engestrom <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>

1 files changed, 52 insertions, 30 deletions

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 606a4898fe2..b219201944b 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -22,8 +22,10 @@ anv_entrypoints = custom_target(
   'anv_entrypoints.[ch]',
   input : ['anv_entrypoints_gen.py', vk_api_xml, vk_android_native_buffer_xml],
   output : ['anv_entrypoints.h', 'anv_entrypoints.c'],
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
-             '--xml', '@INPUT2@', '--outdir', meson.current_build_dir()],
+  command : [
+    prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@',
+    '--outdir', meson.current_build_dir(),
+  ],
   depend_files : files('anv_extensions.py'),
 )
 
@@ -31,17 +33,21 @@ anv_extensions_c = custom_target(
   'anv_extensions.c',
   input : ['anv_extensions.py', vk_api_xml, vk_android_native_buffer_xml],
   output : 'anv_extensions.c',
-  command : [prog_python2, '@INPUT0@', '--xml', '@INPUT1@',
-             '--xml', '@INPUT2@', '--out', '@OUTPUT@'],
+  command : [
+    prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--xml', '@INPUT2@',
+    '--out', '@OUTPUT@',
+  ],
 )
 
 intel_icd = custom_target(
   'intel_icd',
   input : 'anv_icd.py',
   output : 'intel_icd.@[email protected]'.format(host_machine.cpu()),
-  command : [prog_python2, '@INPUT@',
-             '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
-             '--out', '@OUTPUT@'],
+  command : [
+    prog_python2, '@INPUT@',
+    '--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
+    '--out', '@OUTPUT@',
+  ],
   depend_files : files('anv_extensions.py'),
   build_by_default : true,
   install_dir : with_vulkan_icd_dir,
@@ -52,9 +58,10 @@ dev_icd = custom_target(
   'dev_icd',
   input : 'anv_icd.py',
   output : 'dev_icd.@[email protected]'.format(host_machine.cpu()),
-  command : [prog_python2, '@INPUT@',
-             '--lib-path', meson.current_build_dir(),
-             '--out', '@OUTPUT@'],
+  command : [
+    prog_python2, '@INPUT@', '--lib-path', meson.current_build_dir(),
+    '--out', '@OUTPUT@'
+  ],
   depend_files : files('anv_extensions.py'),
   build_by_default : true,
   install : false,
@@ -85,11 +92,15 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
   _files = g[1]
   _lib = static_library(
     'libanv_gen@0@'.format(_gen),
-    [anv_gen_files, _files, block_entrypoints, nir_opcodes_h],
-    include_directories : [inc_common, inc_compiler, inc_drm_uapi, inc_intel,
-                           inc_vulkan_util, inc_vulkan_wsi],
-    c_args : [c_vis_args, no_override_init_args, '-msse2',
-              '-DGEN_VERSIONx10=@0@'.format(_gen)],
+    [anv_gen_files, _files, block_entrypoints],
+    include_directories : [
+      inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
+      inc_vulkan_wsi,
+    ],
+    c_args : [
+      c_vis_args, no_override_init_args, '-msse2',
+      '-DGEN_VERSIONx10=@0@'.format(_gen),
+    ],
     dependencies : [dep_libdrm, dep_valgrind],
   )
   libanv_gen_libs += _lib
@@ -145,8 +156,10 @@ endif
 libanv_common = static_library(
   'anv_common',
   [libanv_files, anv_entrypoints, anv_extensions_c, nir_opcodes_h],
-  include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                         inc_vulkan_util, inc_vulkan_wsi],
+  include_directories : [
+    inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+    inc_vulkan_wsi,
+  ],
   c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
   dependencies : [dep_valgrind, anv_deps, dep_libdrm],
 )
@@ -154,11 +167,15 @@ libanv_common = static_library(
 libvulkan_intel = shared_library(
   'vulkan_intel',
   [files('anv_gem.c'), block_entrypoints],
-  include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                         inc_vulkan_util, inc_vulkan_wsi],
+  include_directories : [
+    inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+    inc_vulkan_wsi,
+  ],
   link_whole : [libanv_common, libanv_gen_libs],
-  link_with : [libintel_compiler, libintel_common, libisl, libblorp,
-               libvulkan_util, libvulkan_wsi, libnir, libmesa_util],
+  link_with : [
+    libintel_compiler, libintel_common, libisl, libblorp, libvulkan_util,
+    libvulkan_wsi, libnir, libmesa_util,
+  ],
   dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind],
   c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
   link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
@@ -169,14 +186,18 @@ if with_tests
   libvulkan_intel_test = static_library(
     'vulkan_intel_test',
     [files('anv_gem_stubs.c'), block_entrypoints],
-    include_directories : [inc_common, inc_intel, inc_compiler, inc_drm_uapi,
-                           inc_vulkan_util, inc_vulkan_wsi],
+    include_directories : [
+      inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+      inc_vulkan_wsi,
+    ],
     link_whole : libanv_common,
-    link_with : [libanv_gen_libs, libintel_compiler, libintel_common,
-                 libisl, libblorp, libvulkan_util, libvulkan_wsi,
-                 libnir, libmesa_util],
-    dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps,
-                    dep_valgrind],
+    link_with : [
+      libanv_gen_libs, libintel_compiler, libintel_common, libisl, libblorp,
+      libvulkan_util, libvulkan_wsi, libnir, libmesa_util,
+    ],
+    dependencies : [
+      dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind,
+    ],
     c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags],
   )
 
@@ -187,8 +208,9 @@ if with_tests
       ['tests/@[email protected]'.format(t), dummy_cpp, block_entrypoints],
       link_with : libvulkan_intel_test,
       dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
-      include_directories : [inc_common, inc_intel, inc_compiler,
-                             inc_vulkan_util, inc_vulkan_wsi],
+      include_directories : [
+        inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi,
+      ],
     )
     test('anv_@0@'.format(t), _exe)
   endforeach