[Mesa-dev] [PATCH] meson: fix race condition revealed by using 0.44

[Scott D Phillips]

Dylan Baker <dylan at pnwbakers.com> writes:

> It turns out that the blocking target we had was hiding some race
> conditions in the anv driver with anv_extensions.h generation, we should
> fix those.
>
> CC: Scott D Phillips <scott.d.phillips at intel.com>
> CC: Mark Janes <mark.a.janes at intel.com>
> Fixes: 92550d9b16d2b295bdac087f31b1fd6d0f808e02
>        ("meson: remove workaround for custom target creating .h and .c files")
> Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>

Reviewed-by: Scott D Phillips <scott.d.phillips at intel.com>

> ---
>  src/intel/vulkan/meson.build | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
> index 06acc78391f..f20a8a54c9b 100644
> --- a/src/intel/vulkan/meson.build
> +++ b/src/intel/vulkan/meson.build
> @@ -1,4 +1,4 @@
> -# Copyright © 2017 Intel Corporation
> +# Copyright © 2017-2018 Intel Corporation
>  
>  # Permission is hereby granted, free of charge, to any person obtaining a copy
>  # of this software and associated documentation files (the "Software"), to deal
> @@ -96,7 +96,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
>    _gen = g[0]
>    libanv_gen_libs += static_library(
>      'libanv_gen at 0@'.format(_gen),
> -    [anv_gen_files, g[1], anv_entrypoints[0]],
> +    [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
>      include_directories : [
>        inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
>        inc_vulkan_wsi,
> @@ -220,7 +220,7 @@ if with_tests
>        'anv_ at 0@'.format(t),
>        executable(
>          t,
> -        ['tests/@0 at .c'.format(t), anv_entrypoints[0]],
> +        ['tests/@0 at .c'.format(t), anv_entrypoints[0], anv_extensions_h],
>          link_with : libvulkan_intel_test,
>          dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind],
>          include_directories : [
> -- 
> 2.17.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev