[Mesa-dev] [PATCH mesa 1/4] vulkan/wsi: simplify meson file tracking

Dylan Baker dylan at pnwbakers.com
Mon Oct 29 16:07:30 UTC 2018


Quoting Eric Engestrom (2018-10-28 06:45:05)
> Meson already automatically tracks included headers, so there's no need
> to add them everywhere; cleans up the code a bit.
> 
> Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> ---
>  src/vulkan/wsi/meson.build | 23 +++++------------------
>  1 file changed, 5 insertions(+), 18 deletions(-)
> 
> diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
> index d073b23dc2586a3fcc98..e9812b663e44dc82b896 100644
> --- a/src/vulkan/wsi/meson.build
> +++ b/src/vulkan/wsi/meson.build
> @@ -21,12 +21,8 @@
>  vulkan_wsi_args = []
>  vulkan_wsi_deps = []
>  
> -files_vulkan_wsi = files(
> -  'wsi_common.c',
> -  'wsi_common.h',
> -  'wsi_common_private.h',
> -  'wsi_common_queue.h',
> -)
> +files_vulkan_wsi = files('wsi_common.c')
> +
>  if with_platform_x11
>    vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR']
>    vulkan_wsi_deps += [
> @@ -38,19 +34,13 @@ if with_platform_x11
>      dep_xcb_sync,
>      dep_xshmfence,
>    ]
> -  files_vulkan_wsi += files(
> -    'wsi_common_x11.c',
> -    'wsi_common_x11.h',
> -  )
> +  files_vulkan_wsi += files('wsi_common_x11.c')
>  endif
>  
>  if with_platform_wayland
>    vulkan_wsi_deps += dep_wayland_client
>    vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR']
> -  files_vulkan_wsi += files(
> -    'wsi_common_wayland.c',
> -    'wsi_common_wayland.h',
> -  )
> +  files_vulkan_wsi += files('wsi_common_wayland.c')
>    files_vulkan_wsi += [
>      wayland_drm_client_protocol_h,
>      wayland_drm_protocol_c,
> @@ -61,10 +51,7 @@ endif
>  
>  if with_platform_drm
>    vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR'
> -  files_vulkan_wsi += files(
> -    'wsi_common_display.c',
> -    'wsi_common_display.h',
> -  )
> +  files_vulkan_wsi += files('wsi_common_display.c')
>  endif
>  
>  if with_xlib_lease
> -- 
> Cheers,
>   Eric
> 

For this patch:
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

I've got a todo on my list for a boring day to go through and remove all .h
files from the meson lists, just haven't been bored enough yet :)

Dylan
-------------- 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/20181029/70f2699b/attachment.sig>


More information about the mesa-dev mailing list