meson: Remove unnecessary inc_compiler mentions

The inc_compiler should come as part of idep_compiler, idep_nir or idep_nir_headers dependency. Acked-by: Eric Engestrom <eric@igalia.com> Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com> (v3dv) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25314>
2023-09-20 11:44:36 -07:00
parent ec835595f0
commit 3988d901ac
27 changed files with 34 additions and 41 deletions
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -120,7 +120,7 @@ libamd_common = static_library(
  'amd_common',
  [amd_common_files, sid_tables_h, amdgfxregs_h, gfx10_format_table_c],
  include_directories : [
-    inc_include, inc_src, inc_compiler, inc_amd,
+    inc_include, inc_src, inc_amd,
  ],
  dependencies : [
    dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -88,7 +88,7 @@ _libaco = static_library(
  'aco',
  [libaco_files, aco_opcodes_c, aco_opcodes_h, aco_builder_h],
  include_directories : [
-   inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common,
+   inc_include, inc_src, inc_amd, inc_amd_common,
  ],
  dependencies : [
    dep_llvm, dep_thread, dep_valgrind, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil,
--- a/src/amd/compiler/tests/meson.build
+++ b/src/amd/compiler/tests/meson.build
@@ -59,7 +59,7 @@ test(
                '-DACO_TEST_PYTHON_BIN="@0@"'.format(prog_python.full_path())] +
               cpp_args_aco,
    include_directories : [
-      inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
+      inc_include, inc_src, inc_amd, inc_amd_common, inc_amd_common_llvm,
    ],
    link_with : [
      libamd_common, libamd_common_llvm, libvulkan_radeon,
--- a/src/amd/llvm/meson.build
+++ b/src/amd/llvm/meson.build
@@ -33,7 +33,7 @@ libamd_common_llvm = static_library(
  'amd_common_llvm',
  [amd_common_llvm_files],
  include_directories : [
-    inc_include, inc_src, inc_compiler, inc_amd, inc_amd_common
+    inc_include, inc_src, inc_amd, inc_amd_common
  ],
  link_with: [
    libamd_common
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -194,7 +194,7 @@ libvulkan_radeon = shared_library(
  [libradv_files, radv_entrypoints, sha1_h, radix_sort_spv, bvh_spv],
  vs_module_defs : vulkan_api_def,
  include_directories : [
-    inc_include, inc_src, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util,
+    inc_include, inc_src, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_util,
  ],
  link_with : [
    libamd_common, libamd_common_llvm, libamdgpu_addrlib,
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -113,7 +113,7 @@ foreach ver : v3d_versions
    [files_per_version, v3d_xml_pack, v3dv_entrypoints[0]],
    include_directories : [
      inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
-      inc_compiler, inc_util,
+      inc_util,
    ],
    c_args : [v3dv_flags, '-DV3D_VERSION=' + ver],
    gnu_symbol_visibility : 'hidden',
@@ -125,7 +125,7 @@ libvulkan_broadcom = shared_library(
  'vulkan_broadcom',
  [libv3dv_files, v3dv_entrypoints, sha1_h],
  include_directories : [
-    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_compiler, inc_util,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_util,
  ],
  link_with : [
    libbroadcom_cle,
--- a/src/compiler/clc/meson.build
+++ b/src/compiler/clc/meson.build
@@ -118,7 +118,7 @@ _libmesaclc = static_library(
  'libmesaclc',
  files_libmesaclc,
  sources: _libmesaclc_sources,
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_spirv],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_spirv],
  c_args : _libmesaclc_c_args,
  cpp_args : [_libmesaclc_cpp_args, _libmesaclc_c_args],
  dependencies: [idep_nir, dep_clang, dep_llvm, dep_llvmspirvlib,
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -256,7 +256,7 @@ libglsl = static_library(
  cpp_args : [cpp_msvc_compat_args],
  gnu_symbol_visibility : 'hidden',
  link_with : libglcpp,
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  dependencies : idep_nir,
  build_by_default : false,
 )
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -311,7 +311,7 @@ _libnir = static_library(
  [files_libnir, nir_opt_algebraic_c, nir_opcodes_c,
   nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h,
   nir_intrinsics_c, nir_intrinsics_h, nir_intrinsics_indices_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
  c_args : [c_msvc_compat_args, no_override_init_args],
  gnu_symbol_visibility : 'hidden',
  dependencies : [idep_compiler, dep_valgrind],
--- a/src/compiler/spirv/meson.build
+++ b/src/compiler/spirv/meson.build
@@ -82,7 +82,7 @@ spirv2nir = executable(
  'spirv2nir',
  files('spirv2nir.c'),
  dependencies : [dep_m, idep_vtn, idep_mesautil],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa],
  c_args : [c_msvc_compat_args, no_override_init_args],
  gnu_symbol_visibility : 'hidden',
  build_by_default : with_tools.contains('nir'),
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -42,7 +42,6 @@ libtu_files = files(
 libtu_includes = [
    inc_include,
    inc_src,
-    inc_compiler,
    inc_freedreno,
 ]

--- a/src/gallium/drivers/lima/meson.build
+++ b/src/gallium/drivers/lima/meson.build
@@ -121,7 +121,7 @@ lima_compiler = executable(
    'standalone/glsl.cpp'
  ),
  include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi, inc_compiler,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi,
  ],
  dependencies : [
    idep_nir,
@@ -143,7 +143,7 @@ lima_disasm = executable(
    'standalone/lima_disasm.c',
  ),
  include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi, inc_compiler,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_mesa, inc_mapi,
  ],
  dependencies : [
    idep_mesautil,
--- a/src/gallium/drivers/r600/meson.build
+++ b/src/gallium/drivers/r600/meson.build
@@ -179,7 +179,7 @@ libr600 = static_library(
  cpp_args: r600_cpp_args,
  gnu_symbol_visibility : 'hidden',
  include_directories : [
-    inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
+    inc_src, inc_mapi, inc_mesa, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
    inc_gallium_drivers,
  ],

--- a/src/gallium/drivers/r600/sfn/tests/meson.build
+++ b/src/gallium/drivers/r600/sfn/tests/meson.build
@@ -2,7 +2,7 @@
 r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp',
   cpp_args: r600_cpp_args,
   include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include,
-                           inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
+                           inc_gallium, inc_gallium_aux, inc_amd_common,
                           inc_gallium_drivers, ],
   dependencies : [idep_gtest, dep_thread, dep_llvm, idep_nir,
                     idep_nir_headers],
@@ -11,7 +11,7 @@ r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp',

 r600_test_dep = declare_dependency(
    include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include,
-                            inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
+                            inc_gallium, inc_gallium_aux, inc_amd_common,
                            inc_gallium_drivers, ],
    link_with : [ libr600, libmesa, libgalliumvl,  libgallium, libradeonwinsys, r600_test_lib],
    dependencies : [idep_gtest, dep_thread, dep_llvm, idep_nir,
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -102,7 +102,7 @@ files_libradeonsi = files(
 )

 radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
-                         inc_amd_common_llvm, inc_gallium_drivers, inc_compiler]
+                         inc_amd_common_llvm, inc_gallium_drivers]
 radeonsi_deps = [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil, idep_aco]

 radeonsi_gfx_libs = []
--- a/src/gallium/frontends/lavapipe/meson.build
+++ b/src/gallium/frontends/lavapipe/meson.build
@@ -46,7 +46,7 @@ liblavapipe_st = static_library(
  [liblvp_files, lvp_entrypoints, sha1_h],
  c_args : [ c_msvc_compat_args, lvp_flags],
  gnu_symbol_visibility : 'hidden',
-  include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_compiler, inc_gallium_aux, inc_llvmpipe ],
+  include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux, inc_llvmpipe ],
  dependencies : [ dep_llvm, idep_nir, idep_mesautil, idep_vulkan_util, idep_vulkan_wsi,
                   idep_vulkan_runtime, lvp_deps ]
 )
--- a/src/imagination/rogue/meson.build
+++ b/src/imagination/rogue/meson.build
@@ -61,7 +61,6 @@ libpowervr_rogue = shared_library(
  include_directories : [
    inc_imagination,
    inc_include,
-    inc_compiler,
    inc_src,
  ],
  c_args : [no_override_init_args],
--- a/src/imagination/rogue/tools/meson.build
+++ b/src/imagination/rogue/tools/meson.build
@@ -30,7 +30,6 @@ rogue_compiler = executable(
    inc_imagination,
    inc_include,
    inc_src,
-    inc_compiler,
    inc_rogue,
  ],
  build_by_default : with_imagination_tools,
--- a/src/imagination/vulkan/meson.build
+++ b/src/imagination/vulkan/meson.build
@@ -118,7 +118,6 @@ libvulkan_powervr_mesa = shared_library(
    inc_imagination,
    inc_include,
    inc_src,
-    inc_compiler,
  ],
  link_with : [
    libpowervr_common,
--- a/src/intel/vulkan/grl/meson.build
+++ b/src/intel/vulkan/grl/meson.build
@@ -162,7 +162,7 @@ foreach t : [['125', 'gfx125', 'dg2']]
    [grl_cl_kernel_h, grl_compiled_cl_kernels, grl_cl_kernel_c,
     grl_genX_files, grl_metakernel_c, grl_metakernel_h],
    include_directories : [
-      inc_include, inc_src, inc_compiler,
+      inc_include, inc_src,
      inc_intel,
    ],
    c_args : [
@@ -193,7 +193,6 @@ libgrl = static_library(
  [grl_cl_kernel_h],
  include_directories : [
    inc_include, inc_src, inc_intel,
-    inc_compiler,
  ],
  link_whole : [grl_genX_libs],
  dependencies : [libgrl_deps, idep_anv_headers],
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -116,7 +116,7 @@ foreach _gfx_ver : ['90', '110', '120', '125']
    'anv_per_hw_ver@0@'.format(_gfx_ver),
    [anv_per_hw_ver_files, anv_entrypoints[0], anv_internal_spvs, ],
    include_directories : [
-      inc_include, inc_src, inc_compiler, inc_intel,
+      inc_include, inc_src, inc_intel,
    ],
    c_args : anv_flags + ['-DGFX_VERx10=@0@'.format(_gfx_ver)],
    gnu_symbol_visibility : 'hidden',
@@ -226,7 +226,7 @@ libanv_common = static_library(
    anv_internal_spvs,
  ],
  include_directories : [
-    inc_include, inc_src, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel,
    inc_util,
  ],
  c_args : anv_flags,
@@ -239,7 +239,7 @@ libvulkan_intel = shared_library(
  'vulkan_intel',
  [files('anv_gem.c'), anv_entrypoints[0]],
  include_directories : [
-    inc_include, inc_src, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel,
  ],
  link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl,
  link_with : [
@@ -276,7 +276,7 @@ if with_tests
    'vulkan_intel_test',
    [files('anv_gem_stubs.c'), anv_entrypoints[0]],
    include_directories : [
-      inc_include, inc_src, inc_intel, inc_compiler,
+      inc_include, inc_src, inc_intel,
    ],
    link_whole : libanv_common,
    link_with : [
@@ -316,7 +316,7 @@ if with_tests
        idep_vulkan_runtime, idep_intel_driver_ds, idep_intel_dev,
      ],
      include_directories : [
-        inc_include, inc_src, inc_intel, inc_compiler,
+        inc_include, inc_src, inc_intel,
      ],
    ),
    suite : ['intel'],
--- a/src/intel/vulkan_hasvk/meson.build
+++ b/src/intel/vulkan_hasvk/meson.build
@@ -83,7 +83,7 @@ foreach g : [['70', ['gfx7_cmd_buffer.c']],
    'anv_per_hw_ver@0@'.format(_gfx_ver),
    [anv_per_hw_ver_files, g[1], anv_hasvk_entrypoints[0]],
    include_directories : [
-      inc_include, inc_src, inc_compiler, inc_intel,
+      inc_include, inc_src, inc_intel,
    ],
    c_args : [
      no_override_init_args, sse2_args,
@@ -172,7 +172,7 @@ libanv_hasvk_common = static_library(
    gen_xml_pack,
  ],
  include_directories : [
-    inc_include, inc_src, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel,
    inc_util,
  ],
  c_args : anv_flags,
@@ -185,7 +185,7 @@ libvulkan_intel_hasvk = shared_library(
  'vulkan_intel_hasvk',
  [files('anv_gem.c'), anv_hasvk_entrypoints[0]],
  include_directories : [
-    inc_include, inc_src, inc_intel, inc_compiler,
+    inc_include, inc_src, inc_intel,
  ],
  link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs],
  link_with : [
@@ -221,7 +221,7 @@ if with_tests
    'vulkan_intel_hasvk_test',
    [files('anv_gem_stubs.c'), anv_hasvk_entrypoints[0]],
    include_directories : [
-      inc_include, inc_src, inc_intel, inc_compiler,
+      inc_include, inc_src, inc_intel,
    ],
    link_whole : libanv_hasvk_common,
    link_with : [
@@ -261,7 +261,7 @@ if with_tests
        idep_vulkan_runtime, idep_intel_driver_ds, idep_intel_dev,
      ],
      include_directories : [
-        inc_include, inc_src, inc_intel, inc_compiler,
+        inc_include, inc_src, inc_intel,
      ],
    ),
    suite : ['intel'],
--- a/src/microsoft/clc/meson.build
+++ b/src/microsoft/clc/meson.build
@@ -28,7 +28,7 @@ libclc_compiler = shared_library(
  'clon12compiler',
  [files_libclc_compiler, sha1_h],
  vs_module_defs : 'clon12compiler.def',
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_gallium, inc_spirv],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_spirv],
  dependencies: [idep_mesaclc, idep_nir_headers, dep_version, idep_mesautil,
                 idep_libdxil_compiler, idep_nir, idep_vtn],
  name_prefix : ''  # otherwise mingw will create libclon12compiler.dll
--- a/src/microsoft/compiler/meson.build
+++ b/src/microsoft/compiler/meson.build
@@ -53,7 +53,7 @@ dxil_nir_algebraic_c = custom_target(
 libdxil_compiler = static_library(
  'dxil_compiler',
  [files_libdxil_compiler, dxil_nir_algebraic_c, sha1_h],
-  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_gallium],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium],
  dependencies: [idep_nir_headers, dep_valgrind],
  gnu_symbol_visibility : 'hidden',
 )
--- a/src/microsoft/spirv_to_dxil/meson.build
+++ b/src/microsoft/spirv_to_dxil/meson.build
@@ -33,7 +33,7 @@ libspirv_to_dxil = both_libraries(
  ],
  vs_module_defs : 'spirv_to_dxil.def',
  dependencies : [idep_nir, idep_vtn, idep_libdxil_compiler],
-  include_directories : [inc_include, inc_src, inc_compiler, inc_gallium],
+  include_directories : [inc_include, inc_src, inc_gallium],
  install : true,
 )

@@ -48,7 +48,7 @@ spirv_to_dxil = executable(
    'spirv2dxil.c',
  ),
  dependencies : [idep_nir, idep_libdxil_compiler, idep_getopt, idep_libspirv_to_dxil],
-  include_directories : [inc_include, inc_src, inc_compiler, inc_gallium],
+  include_directories : [inc_include, inc_src, inc_gallium],
  build_by_default : true,
  install : true,
 )
--- a/src/microsoft/vulkan/meson.build
+++ b/src/microsoft/vulkan/meson.build
@@ -83,7 +83,7 @@ libvulkan_dzn = shared_library(
  vs_module_defs : vulkan_api_def,
  include_directories : [
    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
-    inc_compiler, inc_util
+    inc_util
  ],
  dependencies : [dzn_deps, idep_vulkan_wsi, idep_xmlconfig],
  c_args : dzn_flags,
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -76,7 +76,6 @@ foreach arch : ['6', '7']
    include_directories : [
      inc_include,
      inc_src,
-      inc_compiler,
      inc_gallium, # XXX: util/format/u_formats.h
      inc_gallium_aux, # XXX: renderonly
      inc_panfrost,
@@ -111,7 +110,6 @@ libvulkan_panfrost = shared_library(
  include_directories : [
    inc_include,
    inc_src,
-    inc_compiler,
    inc_gallium, # XXX: util/format/u_formats.h
    inc_gallium_aux, # XXX: renderonly
    inc_panfrost,