Module: Mesa Branch: master Commit: 8970b7839aebefa7207c9535ac34ab4e8cc0ae25 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8970b7839aebefa7207c9535ac34ab4e8cc0ae25
Author: Eric Engestrom <[email protected]> Date: Sat Mar 28 00:28:33 2020 +0100 intel: drop unused include directories Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360> --- src/intel/blorp/meson.build | 2 +- src/intel/common/meson.build | 6 +++--- src/intel/compiler/meson.build | 4 ++-- src/intel/dev/meson.build | 2 +- src/intel/isl/meson.build | 12 ++++++------ src/intel/perf/meson.build | 2 +- src/intel/tools/imgui/meson.build | 2 +- src/intel/tools/meson.build | 18 +++++++++--------- src/intel/vulkan/meson.build | 10 +++++----- src/mesa/drivers/dri/i965/meson.build | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index a1f0f50056f..6696a3dcb3c 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -31,7 +31,7 @@ files_libblorp = files( libblorp = static_library( 'blorp', files_libblorp, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [c_vis_args, no_override_init_args], dependencies : [idep_nir_headers, idep_genxml], ) diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 9fee325a934..fc6f9039011 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -42,7 +42,7 @@ files_libintel_common = files( libintel_common = static_library( ['intel_common', genX_xml_h], files_libintel_common, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_intel], c_args : [c_vis_args, no_override_init_args], link_with : [libisl], dependencies : [dep_expat, dep_libdrm, dep_thread, idep_genxml], @@ -70,7 +70,7 @@ if install_intel_gpu_tests cpp_vis_args, cpp_msvc_compat_args, '-DGEN_VERSIONx10=@0@'.format(g[0]) ], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : [libintel_dev], dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil], install : install_intel_gpu_tests, @@ -97,7 +97,7 @@ if with_tests executable( 'genxml_test', ['tests/genxml_test.c', gentest_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], dependencies : idep_mesautil, link_with : libintel_common, c_args : [ diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 8ad7f187350..af5661e9021 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -139,7 +139,7 @@ brw_nir_trig = custom_target( libintel_compiler = static_library( 'intel_compiler', [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [c_vis_args, no_override_init_args], cpp_args : [cpp_vis_args], dependencies : idep_nir_headers, @@ -158,7 +158,7 @@ if with_tests executable( [t, ir_expression_operation_h], 'test_@[email protected]'.format(t), - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], link_with : [ libintel_compiler, libintel_common, libintel_dev, libisl, ], diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build index ca6fbf236d7..55dbb1cf763 100644 --- a/src/intel/dev/meson.build +++ b/src/intel/dev/meson.build @@ -30,7 +30,7 @@ files_libintel_dev = files( libintel_dev = static_library( ['intel_dev'], files_libintel_dev, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], c_args : [c_vis_args, no_override_init_args], ) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 0182cdbee68..e512169e6cb 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -62,7 +62,7 @@ foreach g : [['40', isl_gen4_files], ['50', []], ['60', isl_gen6_files], isl_gen_libs += static_library( 'isl_gen@0@'.format(_gen), [g[1], isl_gen_files, gen_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_gallium, inc_intel], c_args : [c_vis_args, no_override_init_args, '-DGEN_VERSIONx10=@0@'.format(_gen)], ) @@ -87,7 +87,7 @@ isl_tiled_memcpy = static_library( 'isl_tiled_memcpy', [files_isl_tiled_memcpy], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, + inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, ], c_args : [c_vis_args, no_override_init_args, '-msse2'], extra_files : ['isl_tiled_memcpy.c'] @@ -98,7 +98,7 @@ if with_sse41 'isl_tiled_memcpy_sse41', [files_isl_tiled_memcpy_sse41], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, + inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, ], link_args : ['-Wl,--exclude-libs=ALL'], c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args], @@ -122,7 +122,7 @@ libisl_files = files( libisl = static_library( 'isl', [libisl_files, isl_format_layout_c, genX_bits_h], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41], c_args : [c_vis_args, no_override_init_args], ) @@ -134,7 +134,7 @@ if with_tests 'isl_surf_get_image_offset_test', 'tests/isl_surf_get_image_offset_test.c', dependencies : [dep_m, idep_mesautil], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_gallium, inc_intel], link_with : [libisl, libintel_dev], ), suite : ['intel'], @@ -148,7 +148,7 @@ if with_tests 'isl_aux_info.c', ], dependencies : [dep_m, idep_gtest, idep_mesautil], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_gallium, inc_intel], c_args : '-DIN_UNIT_TEST', cpp_args : '-DIN_UNIT_TEST', ), diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build index 1476bb8c190..ef8344d584c 100644 --- a/src/intel/perf/meson.build +++ b/src/intel/perf/meson.build @@ -36,7 +36,7 @@ libintel_perf = static_library( 'intel_perf', gen_perf_sources, include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_util, + inc_include, inc_src, inc_intel, ], c_args : [c_vis_args, no_override_init_args, '-msse2'], cpp_args : [cpp_vis_args, '-msse2'], diff --git a/src/intel/tools/imgui/meson.build b/src/intel/tools/imgui/meson.build index 9e1f178a2bc..257df393198 100644 --- a/src/intel/tools/imgui/meson.build +++ b/src/intel/tools/imgui/meson.build @@ -6,7 +6,7 @@ libintel_imgui_gtk_deps = [ libintel_imgui_gtk = static_library( 'intel_imgui_gtk', files('imgui_impl_gtk3.cpp', 'imgui_impl_opengl3.cpp'), - include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], + include_directories: inc_src, dependencies : libintel_imgui_gtk_deps, cpp_args : ['-w'], install: false diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index 675ee515c15..a13ba4c9961 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -21,7 +21,7 @@ libaub = static_library( 'aub', files('aub_read.c', 'aub_mem.c'), - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], dependencies : idep_mesautil, link_with : [libintel_common, libintel_dev], c_args : [c_vis_args, no_override_init_args], @@ -32,7 +32,7 @@ aubinator = executable( 'aubinator', files('aubinator.c'), dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], c_args : [c_vis_args, no_override_init_args], install : true @@ -42,7 +42,7 @@ aubinator_error_decode = executable( 'aubinator_error_decode', files('aubinator_error_decode.c'), dependencies : [idep_mesautil, dep_zlib, dep_thread], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true @@ -52,7 +52,7 @@ i965_disasm = executable( 'i965_disasm', files('i965_disasm.c'), dependencies : [idep_mesautil, dep_thread], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mesa, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true @@ -62,7 +62,7 @@ error2aub = executable( 'intel_error2aub', files('aub_write.h', 'aub_write.c', 'error2aub.c'), dependencies : [dep_zlib, dep_dl, dep_thread, dep_m], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : [libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true @@ -85,7 +85,7 @@ libintel_sanitize_gpu = shared_library( 'intel_sanitize_gpu', files('intel_sanitize_gpu.c'), dependencies : [idep_mesautil, dep_dl, dep_thread], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : libintel_common, c_args : [c_vis_args, no_override_init_args, c_sse2_args], install_dir : get_option('libexecdir'), @@ -107,7 +107,7 @@ libintel_dump_gpu = shared_library( 'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c', ), dependencies : dep_dl, - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : libintel_dev, c_args : [c_vis_args, no_override_init_args], install_dir : get_option('libexecdir'), @@ -121,7 +121,7 @@ if with_tools.contains('intel-ui') 'aubinator_viewer', files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'), dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], c_args : [c_vis_args, no_override_init_args], cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'], @@ -150,7 +150,7 @@ i965_asm = executable( 'i965_asm', ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c], dependencies : [idep_mesautil, dep_thread], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel], + include_directories : [inc_include, inc_src, inc_mesa, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 1cdcf03e45f..5884ac05647 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -86,7 +86,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], 'anv_gen@0@'.format(_gen), [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_intel, inc_vulkan_wsi, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, inc_vulkan_wsi, ], c_args : [ c_vis_args, no_override_init_args, c_sse2_args, @@ -180,7 +180,7 @@ libanv_common = static_library( gen_xml_pack, ], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, inc_util, ], c_args : anv_flags, @@ -191,7 +191,7 @@ libvulkan_intel = shared_library( 'vulkan_intel', [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, ], link_whole : [libanv_common, libanv_gen_libs], link_with : [ @@ -225,7 +225,7 @@ if with_tests 'vulkan_intel_test', [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, ], link_whole : libanv_common, link_with : [ @@ -251,7 +251,7 @@ if with_tests link_with : libvulkan_intel_test, dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, ], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, ], ), suite : ['intel'], diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index cf94548800b..4d6cd07dbc4 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -136,7 +136,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110'] 'i965_gen@0@'.format(v), ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c', 'genX_state_upload.c', gen_xml_pack], - include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common], + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_dri_common], c_args : [ c_vis_args, no_override_init_args, c_sse2_args, '-DGEN_VERSIONx10=@0@'.format(v), @@ -150,7 +150,7 @@ libi965 = static_library( 'i965', [files_i965, ir_expression_operation_h], include_directories : [ - inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common, + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_dri_common, ], c_args : [c_vis_args, no_override_init_args, c_sse2_args], cpp_args : [cpp_vis_args, c_sse2_args], _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
