diff options
| author | Dylan Baker <[email protected]> | 2018-04-16 14:34:35 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-04-24 14:08:15 -0700 |
| commit | 92550d9b16d2b295bdac087f31b1fd6d0f808e02 (patch) | |
| tree | a0ee8a712e278076e1358e2b202d5702cbd7efdd | |
| parent | 5a670d08c02c2fdfd8eb57914939045c1bdfb9b4 (diff) | |
meson: remove workaround for custom target creating .h and .c files
In more modern versions of meson a custom_target returns an index-able
object. This allows us to create accurate dependency models for targets
that rely only on the header and not on the code from anv_entrypoints.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/intel/vulkan/meson.build | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 2dce0a1515b..0895bdac1cc 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -81,15 +81,6 @@ dev_icd = custom_target( install : false, ) -# TODO: workaround for anv_entrypoints combining the .h and .c files in it's -# output. See issue #2346 -block_entrypoints = custom_target( - 'block_entrypoints', - command : [prog_touch, '@OUTPUT@'], - output : 'null', - depends : anv_entrypoints, -) - libanv_gen_libs = [] anv_gen_files = files( 'genX_blorp_exec.c', @@ -105,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@0@'.format(_gen), - [anv_gen_files, g[1], block_entrypoints], + [anv_gen_files, g[1], anv_entrypoints[0]], include_directories : [ inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util, inc_vulkan_wsi, @@ -186,7 +177,7 @@ libanv_common = static_library( libvulkan_intel = shared_library( 'vulkan_intel', - [files('anv_gem.c'), block_entrypoints, anv_extensions_h], + [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, inc_vulkan_wsi, @@ -207,7 +198,7 @@ libvulkan_intel = shared_library( if with_tests libvulkan_intel_test = static_library( 'vulkan_intel_test', - [files('anv_gem_stubs.c'), block_entrypoints, anv_extensions_h], + [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, inc_vulkan_wsi, @@ -229,7 +220,7 @@ if with_tests 'anv_@0@'.format(t), executable( t, - ['tests/@[email protected]'.format(t), dummy_cpp, block_entrypoints], + ['tests/@[email protected]'.format(t), dummy_cpp, anv_entrypoints[0]], link_with : libvulkan_intel_test, dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind], include_directories : [ |