meson: inline `inc_common`

Let's make it clear what includes are being added everywhere, so that
they can be cleaned up.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>

diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 2083f60f7a9e81356e9b41abff0628dd9c43132a..a22b7bc16e6dfea57b2665032fb2ee96bc40627d 100644 (file)
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -60,7 +60,7 @@ libamdgpu_addrlib = static_library(
       'inc', 'src', 'src/core', 'src/chip/gfx9', 'src/chip/r800',
       'src/chip/gfx10',
     ),
-    inc_amd_common, inc_common, inc_src,
+    inc_amd_common, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
   ],
   cpp_args : [cpp_vis_args, '-Wno-unused-variable'],
 )

diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build
index 25fc75fb495a3763b5723d60becefdd967fa3b2b..26029e06b08ee1aacfedb220f3bb5bfef40e64ec 100644 (file)
--- a/src/amd/common/meson.build
+++ b/src/amd/common/meson.build
@@ -58,7 +58,7 @@ libamd_common = static_library(
   'amd_common',
   [amd_common_files, sid_tables_h, amdgfxregs_h],
   include_directories : [
-    inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_mapi, inc_amd,
   ],
   dependencies : [
     dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,

diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build
index bce5093651b1f6714c4c18b83bb20c009ae95d81..8a0ebb0befc5f71bb1271243cb958a32aeee489d 100644 (file)
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -86,7 +86,7 @@ _libaco = static_library(
   'aco',
   [libaco_files, aco_opcodes_c, aco_opcodes_h, aco_builder_h],
   include_directories : [
-   inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common, inc_amd_common_llvm,
+   inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
   ],
   link_with : [
     libamd_common

diff --git a/src/amd/llvm/meson.build b/src/amd/llvm/meson.build
index f9868cfac0961f09ed4f15bf8e4e8ae2a7b47c56..6c68c413d9c30ca13c54523c4fdc1c3eeabe81db 100644 (file)
--- a/src/amd/llvm/meson.build
+++ b/src/amd/llvm/meson.build
@@ -35,7 +35,7 @@ libamd_common_llvm = static_library(
   'amd_common_llvm',
   [amd_common_llvm_files],
   include_directories : [
-    inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, inc_amd_common
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common
   ],
   link_with: [
     libamd_common

diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 2a3df6803d5ce40e85df1e36d138cf7a8f542fe7..efcf2dd6c8927fdbe6eb1f43087fbe69479347b5 100644 (file)
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -161,7 +161,7 @@ libvulkan_radeon = shared_library(
   'vulkan_radeon',
   [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, radv_gfx10_format_table_h],
   include_directories : [
-    inc_common, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi,
   ],
   link_with : [
     libamd_common, libamd_common_llvm, libamdgpu_addrlib, libvulkan_wsi,

diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build
index a2f47625a5020c2809f350e73c5aa8c4a5681554..01167672f9f88c54036c6f198188f796f4e73c0e 100644 (file)
--- a/src/broadcom/cle/meson.build
+++ b/src/broadcom/cle/meson.build
@@ -56,7 +56,7 @@ v3d_xml_h = custom_target(
 libbroadcom_cle = static_library(
   ['broadcom_cle', v3d_xml_h],
   'v3d_decoder.c',
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind, dep_expat, dep_zlib],
   build_by_default : false,

diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
index d7af999c3210b3ee7d72a947d24f6bad0a15b7a3..c3e1994aee54bf861e46db3971f6cdf5af6b94f2 100644 (file)
--- a/src/broadcom/compiler/meson.build
+++ b/src/broadcom/compiler/meson.build
@@ -45,7 +45,7 @@ libbroadcom_compiler_files = files(
 libbroadcom_compiler = static_library(
   ['broadcom_compiler', v3d_xml_pack],
   libbroadcom_compiler_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
   build_by_default : false,

diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
index 4fcc594add63372644f7ed6392e9767b90aa9e7d..d053d2c5b595f3fd33fb0d4e42da0d96dcc59eec 100644 (file)
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@@ -21,7 +21,7 @@
 libv3d_noop_drm_shim = shared_library(
   ['v3d_noop_drm_shim'],
   'v3d_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   c_args : c_vis_args,
   install : true,
@@ -41,7 +41,7 @@ if dep_v3dv3.found()
                             'v3dx.c',
                             v3d_xml_pack
         ],
-        include_directories : [inc_common, inc_broadcom, inc_src, inc_gallium_v3d],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
         c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args],
         dependencies: [dep_valgrind, dep_thread, dep_v3dv3],
     )
@@ -55,7 +55,7 @@ if dep_v3dv3.found()
     ],
     dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3],
     link_with: per_version_libs,
-    include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
     c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args],
     cpp_args : [v3dv3_c_args]
   )

diff --git a/src/broadcom/meson.build b/src/broadcom/meson.build
index 57f0d889b25e32c841e9fe1e74e0222450ad0502..3abbc5431d717f6d272c06c4bbd8b7f900ac0c71 100644 (file)
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -42,7 +42,7 @@ foreach ver : v3d_versions
       files('clif/v3dx_dump.c'),
       v3d_xml_pack
     ],
-    include_directories : [inc_common, inc_broadcom, inc_src],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
     c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
     dependencies: [dep_valgrind, dep_thread],
   )
@@ -54,7 +54,7 @@ libbroadcom_v3d = static_library(
     files('common/v3d_debug.c', 'common/v3d_device_info.c', 'clif/clif_dump.c'),
     v3d_xml_pack,
   ],
-  include_directories : [inc_common, inc_broadcom, inc_src],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   link_whole : v3d_libs + per_version_libs,
   build_by_default : false,

diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
index c9cf7b9e92b6cc242e37f32fb973b3ebcfd72901..08162037a3265d0968a5a0d4d83f5a4ccdee5f98 100644 (file)
--- a/src/broadcom/qpu/meson.build
+++ b/src/broadcom/qpu/meson.build
@@ -27,7 +27,7 @@ libbroadcom_qpu_files = files(
 libbroadcom_qpu = static_library(
   ['broadcom_qpu', v3d_xml_pack],
   libbroadcom_qpu_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind],
   build_by_default : false,
@@ -41,7 +41,7 @@ test(
     'qpu_disasm', 'tests/qpu_disasm.c',
     link_with: libbroadcom_qpu,
     dependencies : idep_mesautil,
-    include_directories: inc_common
+    include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
   ),
   suite : ['broadcom'],
 )

diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build
index 81c8d65dca13a4fa23cad99a024abe8e6b8c8a27..c87f0b6c0beb8e4c75848d1ddf8e3bbb0c6f3a9f 100644 (file)
--- a/src/compiler/glsl/glcpp/meson.build
+++ b/src/compiler/glsl/glcpp/meson.build
@@ -49,7 +49,7 @@ libglcpp = static_library(
   'glcpp',
   [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
   dependencies : idep_mesautil,
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
   build_by_default : false,
@@ -59,7 +59,7 @@ libglcpp_standalone = static_library(
   'glcpp_standalone',
   'pp_standalone_scaffolding.c',
   link_with : libglcpp,
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
   build_by_default : false,
@@ -69,7 +69,7 @@ glcpp = executable(
   'glcpp',
   'glcpp.c',
   dependencies : [dep_m, idep_getopt],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglcpp_standalone, libglsl_util],
   c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
   build_by_default : false,

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index eff98fef109edd4c9faede2f961195637bbc1e9b..215c472ebaeadb21fd42ee86c0f0a7d631faabbf 100644 (file)
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -231,7 +231,7 @@ libglsl = static_library(
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   link_with : libglcpp,
-  include_directories : [inc_common, inc_compiler],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler],
   dependencies : idep_nir,
   build_by_default : false,
 )
@@ -241,7 +241,7 @@ libglsl_standalone = static_library(
   [files_libglsl_standalone, ir_expression_operation_h],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglsl, libglsl_util, libglcpp_standalone],
   dependencies : [idep_mesautil, idep_getopt],
   build_by_default : false,
@@ -253,7 +253,7 @@ glsl_compiler = executable(
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   dependencies : [dep_clock, dep_thread, idep_getopt],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : [libglsl_standalone],
   build_by_default : with_tools.contains('glsl'),
   install : with_tools.contains('glsl'),
@@ -265,7 +265,7 @@ glsl_test = executable(
    ir_expression_operation_h],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [dep_clock, dep_thread, idep_getopt],
   link_with : [libglsl, libglsl_standalone, libglsl_util],
   build_by_default : with_tools.contains('glsl'),

diff --git a/src/compiler/glsl/tests/meson.build b/src/compiler/glsl/tests/meson.build
index 3526110dbc1ab3c33b77b55f6087357a8c35c40d..41f8ae615d17b826d7b68280e498e7e54b59b300 100644 (file)
--- a/src/compiler/glsl/tests/meson.build
+++ b/src/compiler/glsl/tests/meson.build
@@ -25,7 +25,7 @@ if with_shader_cache
       'cache_test',
       'cache_test.c',
       c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common, inc_glsl],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
       link_with : [libglsl],
       dependencies : [dep_clock, dep_thread],
     ),
@@ -42,7 +42,7 @@ test(
      'lower_int64_test.cpp', 'opt_add_neg_to_sub_test.cpp',
      'varyings_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_standalone, libglsl_util],
     dependencies : [dep_clock, dep_thread, idep_gtest],
   ),
@@ -57,7 +57,7 @@ test(
      'uniform_initializer_utils.cpp', 'uniform_initializer_utils.h',
      ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
   ),
@@ -70,7 +70,7 @@ test(
     'sampler_types_test',
     ['sampler_types_test.cpp', ir_expression_operation_h],
     cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-    include_directories : [inc_common, inc_glsl],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glsl],
     link_with : [libglsl, libglsl_util],
     dependencies : [dep_thread, idep_gtest],
   ),

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 9dfcb3449efb1829bbbc415dfa0e619bc3888e8d..e068a30a6bdd7f9c7e9c050f9cfabb13e2c2cde7 100644 (file)
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -44,7 +44,7 @@ ir_expression_operation_h = custom_target(
 libcompiler = static_library(
   'compiler',
   [files_libcompiler, ir_expression_operation_h],
-  include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_common],
+  include_directories : [inc_mapi, inc_mesa, inc_compiler, inc_include, inc_src, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   dependencies : [dep_valgrind],
@@ -61,7 +61,7 @@ spirv2nir = executable(
   'spirv2nir',
   files('spirv/spirv2nir.c'),
   dependencies : [dep_m, idep_nir, idep_mesautil],
-  include_directories : [inc_common, include_directories('spirv')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('spirv')],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   build_by_default : with_tools.contains('nir'),
   install : with_tools.contains('nir'),

diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 3e48eb1cf6a708d2e380522595d1ef97c03c6dfc..82e2d17d8cbb0df82d372e10c2285a2512158872 100644 (file)
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -253,7 +253,7 @@ _libnir = static_library(
   [files_libnir, spirv_info_c, nir_opt_algebraic_c, nir_opcodes_c,
    nir_opcodes_h, nir_constant_expressions_c, nir_builder_opcodes_h,
    vtn_gather_types_c, nir_intrinsics_c, nir_intrinsics_h],
-  include_directories : [inc_common, inc_compiler, include_directories('../spirv')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, include_directories('../spirv')],
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
   link_with : libcompiler,
   build_by_default : false,
@@ -280,7 +280,7 @@ if with_tests
       'nir_builder_test',
       files('tests/builder_tests.cpp'),
       cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -292,7 +292,7 @@ if with_tests
       'nir_control_flow_test',
       files('tests/control_flow_tests.cpp'),
       cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -304,7 +304,7 @@ if with_tests
       'nir_vars_test',
       files('tests/vars_tests.cpp'),
       cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -325,7 +325,7 @@ if with_tests
       'negative_equal',
       files('tests/negative_equal_tests.cpp'),
       c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -337,7 +337,7 @@ if with_tests
       'comparison_pre',
       files('tests/comparison_pre_tests.cpp'),
       c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -349,7 +349,7 @@ if with_tests
       'load_store_vectorizer',
       files('tests/load_store_vectorizer_tests.cpp'),
       cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],
@@ -362,7 +362,7 @@ if with_tests
       'nir_serialize_test',
       files('tests/serialize_tests.cpp'),
       cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-      include_directories : [inc_common],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
     ),
     suite : ['compiler', 'nir'],

diff --git a/src/drm-shim/meson.build b/src/drm-shim/meson.build
index ab05f9af0355f29a16415db06fe52c637ec06422..c22aea87349d9adad752cb7d9976021d53a6c307 100644 (file)
--- a/src/drm-shim/meson.build
+++ b/src/drm-shim/meson.build
@@ -24,7 +24,7 @@ drm_shim = static_library(
     'device.c',
     'drm_shim.c',
   ],
-  include_directories: [inc_common],
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: [idep_mesautil, dep_dl],
   c_args : [c_vis_args, '-std=gnu99'],
 )

diff --git a/src/etnaviv/drm-shim/meson.build b/src/etnaviv/drm-shim/meson.build
index 511fa7070cf4cae1f865ba87073bf1dc7bdb2dd7..941da099a7cbcdffb08d757226b41c4ab54c5ba7 100644 (file)
--- a/src/etnaviv/drm-shim/meson.build
+++ b/src/etnaviv/drm-shim/meson.build
@@ -23,7 +23,7 @@
 libetnaviv_noop_drm_shim = shared_library(
   'etnaviv_noop_drm_shim',
   'etnaviv_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   c_args : c_vis_args,
   install : true,

diff --git a/src/etnaviv/drm/meson.build b/src/etnaviv/drm/meson.build
index e06bd406fff051c8657acf8720cd0e0fb356a900..20e6ee7dd87054acae82ff43be92bbb3607294ad 100644 (file)
--- a/src/etnaviv/drm/meson.build
+++ b/src/etnaviv/drm/meson.build
@@ -35,7 +35,12 @@ libetnaviv_drm = static_library(
   libetnaviv_drm_files,
   include_directories : [
     inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
   ],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],

diff --git a/src/etnaviv/drm/tests/meson.build b/src/etnaviv/drm/tests/meson.build
index cb3dce2e09d1ca26bdd4f9e199f56080b6abc7af..241e3e4022cfecbb67e0054046d5efed4dd5aab7 100644 (file)
--- a/src/etnaviv/drm/tests/meson.build
+++ b/src/etnaviv/drm/tests/meson.build
@@ -23,7 +23,12 @@ etnaviv_cmd_stream_test = executable(
   'etnaviv_cmd_stream_test.c',
   include_directories : [
     inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
   ],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
@@ -41,7 +46,12 @@ etnaviv_bo_cache_test = executable(
   'etnaviv_bo_cache_test.c',
   include_directories : [
     inc_etnaviv,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
   ],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],

diff --git a/src/freedreno/computerator/meson.build b/src/freedreno/computerator/meson.build
index 80e6f66a772afdda01b92e3eae89977971806ef4..57b89d5f7d75abf626889f7b1d37028e3370d512 100644 (file)
--- a/src/freedreno/computerator/meson.build
+++ b/src/freedreno/computerator/meson.build
@@ -50,8 +50,13 @@ computerator = executable(
   'computerator',
   computerator_files,
   include_directories : [
-    inc_common,
     inc_freedreno,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
   ],
   link_with : [
     libfreedreno_drm,

diff --git a/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build
index ac05b4262ceb4b1ff8a66e3395053e039b83c803..6e7166bc0961058a9a1484dc71cfe2499dead4d4 100644 (file)
--- a/src/freedreno/drm-shim/meson.build
+++ b/src/freedreno/drm-shim/meson.build
@@ -22,7 +22,7 @@
 libfreedreno_noop_drm_shim = shared_library(
   ['freedreno_noop_drm_shim'],
   'freedreno_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   c_args : c_vis_args,
   install : true,

diff --git a/src/freedreno/drm/meson.build b/src/freedreno/drm/meson.build
index cee996acd7e63e1c0a63e8ac4fcdbf6d030dc56a..1ebfdfba67a6a752fb9daf0f0c7863560915377e 100644 (file)
--- a/src/freedreno/drm/meson.build
+++ b/src/freedreno/drm/meson.build
@@ -40,7 +40,12 @@ libfreedreno_drm = static_library(
   libfreedreno_drm_files,
   include_directories : [
     inc_freedreno,
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
   ],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],

diff --git a/src/freedreno/fdl/meson.build b/src/freedreno/fdl/meson.build
index 429be170a8b44083505d1fd22d08dab963c9c386..ded2164fc7e403aecf23fd59b20406329c38dcb9 100644 (file)
--- a/src/freedreno/fdl/meson.build
+++ b/src/freedreno/fdl/meson.build
@@ -24,7 +24,7 @@ libfreedreno_layout = static_library(
     'fd6_layout.c',
     'freedreno_layout.c',
   ],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies : idep_nir_headers,

diff --git a/src/freedreno/ir3/meson.build b/src/freedreno/ir3/meson.build
index 2b5656faf808b6c34d16389e8ac7167e333687c9..69103341158753280d0c94f9ffd5d78b8a27608c 100644 (file)
--- a/src/freedreno/ir3/meson.build
+++ b/src/freedreno/ir3/meson.build
@@ -86,7 +86,7 @@ libfreedreno_ir3_files = files(
 libfreedreno_ir3 = static_library(
   'freedreno_ir3',
   [libfreedreno_ir3_files, ir3_nir_trig_c, ir3_nir_imul_c],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies : idep_nir_headers,

diff --git a/src/freedreno/perfcntrs/meson.build b/src/freedreno/perfcntrs/meson.build
index 365af44a113f747041c31af01b90a01b0cf6c656..27f3b7c99f5d27a7a99d046f5f5c03d0310a4973 100644 (file)
--- a/src/freedreno/perfcntrs/meson.build
+++ b/src/freedreno/perfcntrs/meson.build
@@ -29,7 +29,7 @@ libfreedreno_perfcntrs_files = files(
 libfreedreno_perfcntrs = static_library(
   'freedreno_perfcntrs',
   [libfreedreno_perfcntrs_files, freedreno_xml_header_files],
-  include_directories : [inc_freedreno, inc_common],
+  include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies : idep_nir_headers,
@@ -44,8 +44,13 @@ if dep_libconfig.found() and dep_ncurses.found()
     'fdperf',
     'fdperf.c',
     include_directories : [
-      inc_common,
       inc_freedreno,
+      inc_include,
+      inc_src,
+      inc_mapi,
+      inc_mesa,
+      inc_gallium,
+      inc_gallium_aux,
     ],
     link_with : [
       libfreedreno_drm,

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index 27f731a98c2986c57c8395f18a212a11799aa253..ef4c937090989829d552903d66761cec328d514d 100644 (file)
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -101,7 +101,12 @@ libvulkan_freedreno = shared_library(
   'vulkan_freedreno',
   [libtu_files, tu_entrypoints, tu_extensions_c, freedreno_xml_header_files],
   include_directories : [
-    inc_common,
+    inc_include,
+    inc_src,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
     inc_compiler,
     inc_vulkan_wsi,
     inc_freedreno,

diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 69db8050ee45776b4f264b7d1cfa7e2fc445832b..580391ac10e6b796d6364dee183ba1b8e9529cba 100644 (file)
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -69,7 +69,7 @@ foreach v : ['80', '90', '100', '110', '120']
   iris_gen_libs += static_library(
     'iris_gen@0@'.format(v),
     ['iris_blorp.c', 'iris_query.c', 'iris_state.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel],
     c_args : [
       c_vis_args, no_override_init_args, c_sse2_args,
       '-DGEN_VERSIONx10=@0@'.format(v),

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index e48b61b89555b771f00ac7fb8e3fb17d7f653dd0..7a1d18a6394ada5716dcd3a30f025bf60bf8a68c 100644 (file)
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -212,7 +212,7 @@ libnouveau = static_library(
   'nouveau',
   files_libnouveau,
   include_directories : [
-    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_common,
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa,
   ],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 2d0789db80204646940847833df96ba868fe8a93..92f043ea0a02dc2c49c92f77652d5e23343448fd 100644 (file)
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -47,7 +47,8 @@ files_panfrost = files(
 )
 
 panfrost_includes = [
-  inc_common,
+  inc_mapi,
+  inc_mesa,
   inc_gallium,
   inc_gallium_aux,
   inc_include,

diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build
index ecdf8504032e722f5caf74ffaa699a70d78c4689..55d842412768ee848829770030fc048f35f950c6 100644 (file)
--- a/src/gallium/drivers/r600/meson.build
+++ b/src/gallium/drivers/r600/meson.build
@@ -187,7 +187,7 @@ libr600 = static_library(
   c_args : [c_vis_args, r600_c_args, '-Wstrict-overflow=0'],
   cpp_args : [cpp_vis_args],
   include_directories : [
-    inc_src, inc_common, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
+    inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common,
     inc_gallium_drivers,
   ],
   dependencies: [dep_libdrm_radeon, dep_elf, dep_llvm, idep_nir, idep_nir_headers],

diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
index 6b6ec3652ec2763289d4bf27a3a78d9b9e06a7e7..e68d962ed84db8f329612a074e64c21f314192d0 100644 (file)
--- a/src/gallium/drivers/swr/meson.build
+++ b/src/gallium/drivers/swr/meson.build
@@ -383,7 +383,7 @@ libmesaswr = static_library(
     cpp_msvc_compat_args, cpp_vis_args, swr_cpp_args, swr_avx_args,
     swr_defines,
   ],
-  include_directories : [inc_common, swr_incs],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, swr_incs],
   dependencies : dep_llvm,
 )
 

diff --git a/src/gallium/drivers/virgl/meson.build b/src/gallium/drivers/virgl/meson.build
index 0c04370d4ec734a124d77d1eaabe4f79eb45e09b..dd33d2b7c66a1c74844a4d76b613e0bc46acd9d2 100644 (file)
--- a/src/gallium/drivers/virgl/meson.build
+++ b/src/gallium/drivers/virgl/meson.build
@@ -47,7 +47,7 @@ libvirgl = static_library(
   'virgl',
   [ files_libvirgl, virgl_driinfo_h ],
   c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : dep_libdrm
 )
 

diff --git a/src/gallium/drivers/virgl/tests/meson.build b/src/gallium/drivers/virgl/tests/meson.build
index 86cb27db4e19d1b8d012f0cd1706bcf3f69871c8..ec538c9e0b0913e3f10cb214edea8077c321a3b8 100644 (file)
--- a/src/gallium/drivers/virgl/tests/meson.build
+++ b/src/gallium/drivers/virgl/tests/meson.build
@@ -24,7 +24,7 @@ test(
     'virgl_staging_mgr_test',
     files('virgl_staging_mgr_test.cpp'),
     dependencies : [dep_thread, idep_gtest],
-    include_directories : [inc_common, include_directories('..')],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('..')],
     link_with : [libvirgl, libgallium],
   ),
   suite : ['virgl'],

diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build
index ccef3ff3b216d78ac3d79ce3e5a62fcf6bb8412c..cab79ddae18f1fb98745dfb3da372ce633e8568d 100644 (file)
--- a/src/gallium/drivers/zink/meson.build
+++ b/src/gallium/drivers/zink/meson.build
@@ -43,7 +43,7 @@ libzink = static_library(
   'zink',
   files_libzink,
   c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: [dep_vulkan, idep_nir_headers],
 )
 

diff --git a/src/gallium/state_trackers/glx/xlib/meson.build b/src/gallium/state_trackers/glx/xlib/meson.build
index 34b93c94cf26ed046a80d6b8b6a4324d44cf4798..7b1fdb34ffe6c646d1a3c976b009ec26c9710600 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/meson.build
+++ b/src/gallium/state_trackers/glx/xlib/meson.build
@@ -22,6 +22,6 @@ libxlib = static_library(
   'xlib',
   files('glx_api.c', 'glx_getproc.c', 'glx_usefont.c', 'xm_api.c', 'xm_st.c'),
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_mapi, inc_mesa],
+  include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_mapi, inc_mesa],
   dependencies : [dep_x11, dep_xext, dep_xcb, dep_glproto],
 )

diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index 987d3e23c84d21cc25e18e4e3ad2e53253fe9274..35866c1cba0281b4c4303c683926f794c0cd6b45 100644 (file)
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_st_omx = [inc_common]
+inc_st_omx = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
 dep_st_omx = [
   dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
 ]

diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build
index 84f788fdbaac24833a526ad1cfd5c24b1b8bd502..1929d907b9d64524f1c17e0340e6a53847590cfd 100644 (file)
--- a/src/gallium/state_trackers/va/meson.build
+++ b/src/gallium/state_trackers/va/meson.build
@@ -34,7 +34,7 @@ libva_st = static_library(
       libva_version[0], libva_version[1]
     ),
   ],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [
     dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3,
     dep_libdrm,

diff --git a/src/gallium/state_trackers/xa/meson.build b/src/gallium/state_trackers/xa/meson.build
index 44d97586240b7c92d0dc4c8bc18e40ac0186b329..0c3540f0359060d39a5b0b06680d59be63572c77 100644 (file)
--- a/src/gallium/state_trackers/xa/meson.build
+++ b/src/gallium/state_trackers/xa/meson.build
@@ -39,7 +39,7 @@ libxa_st = static_library(
     'xa_tracker.c', 'xa_yuv.c',
   )],
   c_args : [c_vis_args, '-pedantic'],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
 )
 
 install_headers('xa_composite.h', 'xa_context.h')

diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build
index ab658fcad69ac9e0a811c7554e1ffc35dbe5f528..9022bf4d0a6051b94b6de9efa6d7b109881df705 100644 (file)
--- a/src/gallium/state_trackers/xvmc/meson.build
+++ b/src/gallium/state_trackers/xvmc/meson.build
@@ -22,7 +22,7 @@ libxvmc_st = static_library(
   'xvmc_st',
   files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'),
   c_args : [c_vis_args],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [
     dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv,
     dep_libdrm,

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index ae25a21cb3357661b85ffbd5cfa7da1a4161997d..8da21b3394a9455c1dbc1b3392b5386f3f2b8bac 100644 (file)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -41,7 +41,7 @@ libgallium_dri = shared_library(
   'gallium_dri',
   files('target.c'),
   include_directories : [
-    inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers,
     inc_gallium_winsys, include_directories('../../state_trackers/dri'),
   ],
   c_args : [c_vis_args],

diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
index 7e539b044186db9fd90ec609b9717701fabb2d61..39471b64064dab1f762d76e65d28ae27b7565e17 100644 (file)
--- a/src/gallium/targets/graw-null/meson.build
+++ b/src/gallium/targets/graw-null/meson.build
@@ -22,14 +22,14 @@ libgraw_util = static_library(
   'graw_util',
   ['graw_util.c'],
   c_args : [c_vis_args, c_msvc_compat_args],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
 )
 
 libgraw_null = shared_library(
   'graw_null',
   ['graw_null.c'],
   c_args : [c_vis_args, c_msvc_compat_args],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_with : libgallium,
   dependencies : idep_mesautil,
   name_prefix : host_machine.system() == 'windows' ? '' : 'lib',  # otherwise mingw will create libgraw_null.dll

diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
index 92f483733cf156eedfd3d77bdb2dccc3cd8db37f..0e5d91b9fdd9eb7ee8666f506d13c14fb8680369 100644 (file)
--- a/src/gallium/targets/graw-xlib/meson.build
+++ b/src/gallium/targets/graw-xlib/meson.build
@@ -22,7 +22,7 @@ libgraw_xlib = shared_library(
   'graw_xlib',
   ['graw_xlib.c'],
   c_args : [c_vis_args],
-  include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_gallium_winsys],
   link_with : [
     libgraw_util, libgallium, libws_xlib
   ],

diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
index d92f583210d98da7082702275ccd4c8ed7ce54b1..e35fab5dacf7d4024e3ecc302b2e11ca7e8009b5 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@@ -22,7 +22,7 @@ libswpipe = shared_library(
   'swpipe',
   files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
   include_directories : [
-    inc_common, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_haikugl, inc_gallium_drivers, inc_gallium_winsys,
     include_directories('../../state_trackers/hgl'),
     include_directories('/boot/system/develop/headers/private')
   ],

diff --git a/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
index cd4e02d1fa9f60406b4ab93a547824d8cc13db66..6332267fff4b7393d7967c58a68f4494d74139c8 100644 (file)
--- a/src/gallium/targets/libgl-gdi/meson.build
+++ b/src/gallium/targets/libgl-gdi/meson.build
@@ -31,7 +31,7 @@ libopengl32 = shared_library(
   ['libgl_gdi.c'],
   vs_module_defs : ogldef,
   include_directories : [
-    inc_common, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_wgl, inc_gallium_winsys_sw, inc_gallium_drivers,
   ],
   link_whole : [libwgl],
   link_with : [

diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 921f948ca3a5d8d7478cdc4fdbe1deb347c2d601..8aec6219a8779881b794bc57662d9c80b3d6cab4 100644 (file)
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -41,7 +41,7 @@ libgl = shared_library(
   'GL',
   files('xlib.c'),
   include_directories : [
-    inc_common, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_winsys, inc_gallium_drivers,
     include_directories('../../state_trackers/glx/xlib'),
   ],
   c_args : [c_vis_args, gallium_xlib_c_args],

diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
index 98f01cd7510691b540ccfec78d75a1f3a7cf5016..86311c30cb966f3c1bbcc2973b507ec5a7334067 100644 (file)
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@@ -37,7 +37,7 @@ libomx_gallium = shared_library(
   cpp_args : cpp_vis_args,
   link_args : [omx_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libomx_st],
   link_with : [

diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
index e43aba9029fcee4970e1e8be520f0e18fb23b890..92cd0aa06a5622843f4afce8036496fef8ba76b6 100644 (file)
--- a/src/gallium/targets/osmesa/meson.build
+++ b/src/gallium/targets/osmesa/meson.build
@@ -77,7 +77,7 @@ if with_tests
     executable(
       'osmesa-render',
       'test-render.cpp',
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       link_with: libosmesa,
       dependencies : [idep_gtest],
     ),

diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 24d291c78a9f318057ddc5d67f9cb3bdfca3e04c..e9a3ee126faf07ba7fab5603ff156c21b6236ae3 100644 (file)
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -38,7 +38,7 @@ libva_gallium = shared_library(
   cpp_args : cpp_vis_args,
   link_args : [va_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libva_st],
   link_with : [

diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
index 2032fa096744de80fc17ddb74506a529f0ee6f04..4ea12c4ef02a46db9466f592a9af259a4a8cceac 100644 (file)
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -43,7 +43,7 @@ libvdpau_gallium = shared_library(
   cpp_args : cpp_vis_args,
   link_args : [vdpau_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libvdpau_st],
   link_with : [

diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index c669b0135b9c80b5e60bfcf1ea545adc352da0f6..d61dbd9842b5d343798b91f3036ba57e0cc973ec 100644 (file)
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -39,7 +39,7 @@ libxatracker = shared_library(
   cpp_args : cpp_vis_args,
   link_args : [xa_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libxa_st],
   link_with : [

diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index c1f20191b4bc2e7475e50cb81d3f0569b5c15306..b96a9d344653b6d695d75c0aeff7f6406078d6f6 100644 (file)
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -38,7 +38,7 @@ libxvmc_gallium = shared_library(
   cpp_args : cpp_vis_args,
   link_args : [xvmc_link_args, ld_args_gc_sections],
   include_directories : [
-    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
   link_whole : [libxvmc_st],
   link_with : [

diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build
index 9a1f4e7db00d679030fb2883a3aebf0d62761d4e..6d6840eb1d2583690eee865a7fdbe96e2e54f5c5 100644 (file)
--- a/src/gallium/tests/graw/meson.build
+++ b/src/gallium/tests/graw/meson.build
@@ -29,7 +29,7 @@ foreach t : progs
   executable(
     'graw-' + t,
     t + '.c',
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : [libgraw, libgraw_util, libgallium],
     dependencies : [dep_m, idep_mesautil],
   )

diff --git a/src/gallium/tests/trivial/meson.build b/src/gallium/tests/trivial/meson.build
index bc6fbac47a9c97bfd8ad42e14e708ade67b3f15b..a54e71d72250fa07b5143b3f64101b6d1b3f1359 100644 (file)
--- a/src/gallium/tests/trivial/meson.build
+++ b/src/gallium/tests/trivial/meson.build
@@ -22,7 +22,7 @@ foreach t : ['compute', 'tri', 'quad-tex']
   executable(
     t,
     '@0@.c'.format(t),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : [libgallium, libpipe_loader_dynamic],
     dependencies : idep_mesautil,
     install : false,

diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build
index 3a6badace7e640a6d9ef323f513745d23ad72789..f94e1058d2cdef3200f11ecc3886e6f2ea71e1d6 100644 (file)
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -23,7 +23,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
   exe = executable(
     t,
     '@0@.c'.format(t),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : libgallium,
     dependencies : idep_mesautil,
     install : false,

diff --git a/src/gallium/winsys/sw/xlib/meson.build b/src/gallium/winsys/sw/xlib/meson.build
index c7cb0ffe9d5b32bd7b7276d5625a3fef6d8a91a0..d1f5759b0525a285b4fd65d3b6f9dfeb9167ac4d 100644 (file)
--- a/src/gallium/winsys/sw/xlib/meson.build
+++ b/src/gallium/winsys/sw/xlib/meson.build
@@ -22,6 +22,6 @@ libws_xlib = static_library(
   'ws_xlib',
   files('xlib_sw_winsys.c'),
   c_args : c_vis_args,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [dep_x11, dep_xext, dep_xcb],
 )

diff --git a/src/gallium/winsys/virgl/common/meson.build b/src/gallium/winsys/virgl/common/meson.build
index 9182b79a675ae99b0ecee0b9f56261dac150f109..18a40f28ec14682ad885d1d1fb3f786cca6f0b3a 100644 (file)
--- a/src/gallium/winsys/virgl/common/meson.build
+++ b/src/gallium/winsys/virgl/common/meson.build
@@ -22,7 +22,7 @@ libvirglcommon = static_library(
   'virglcommon',
   'virgl_resource_cache.c',
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
 )
 
 dep_libvirglcommon = declare_dependency(

diff --git a/src/gallium/winsys/virgl/drm/meson.build b/src/gallium/winsys/virgl/drm/meson.build
index cbb5fb9d4b2da7029e98e30e381e017280d868fd..0bfeafaeae9d929cd4f137ed3a462022f97b523a 100644 (file)
--- a/src/gallium/winsys/virgl/drm/meson.build
+++ b/src/gallium/winsys/virgl/drm/meson.build
@@ -22,6 +22,6 @@ libvirgldrm = static_library(
   'virgldrm',
   'virgl_drm_winsys.c',
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : [dep_libdrm, dep_libvirglcommon],
 )

diff --git a/src/gallium/winsys/virgl/vtest/meson.build b/src/gallium/winsys/virgl/vtest/meson.build
index 9befea6735aafe716a965309d184a413e8e38c8f..6363e62c7470fb2e55b42dac9cdf928c3e91a63b 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/meson.build
+++ b/src/gallium/winsys/virgl/vtest/meson.build
@@ -22,6 +22,6 @@ libvirglvtest = static_library(
   'virglvtest',
   ['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
   c_args : c_vis_args,
-  include_directories : [inc_common, inc_gallium_drivers],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
   dependencies : dep_libvirglcommon,
 )

diff --git a/src/glx/meson.build b/src/glx/meson.build
index 85f2697f08d0d035e8b8c948226b3b2bcb5fa54d..d0fcae721762430d9c7bc0b2334612649986bf9c 100644 (file)
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -139,7 +139,7 @@ gl_lib_cargs = [
 libglx = static_library(
   'glx',
   [files_libglx, glx_generated],
-  include_directories : [inc_common, inc_glapi, inc_loader],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_glapi, inc_loader],
   c_args : [
     c_vis_args, gl_lib_cargs,
     '-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),

diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
index ff68d2551648aa7c172480cfe710fb25f10aadd7..a1f0f50056f944e085ede3d9f80e4a28543153b2 100644 (file)
--- 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 c387eb62b9355646688eb6184e296e4db8f31a2c..9fee325a934f001271ae7a3970bce31d723a6034 100644 (file)
--- 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 b110c0efeb3bccc5230a68150867704d2feb2605..8ad7f1873501d9b76f2c36cdd6d8168a3f5fea85 100644 (file)
--- 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_@0@.cpp'.format(t),
-        include_directories : [inc_common, inc_intel],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 0d8543b6b1cbadc022786bea0ec6c5331fc5f98f..ca6fbf236d7e721d114a87b2da7702eacf24b489 100644 (file)
--- 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_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 91447614c9fb46e821483ea4319acb4f9806e5c4..0182cdbee6876799d1b284da76c5d50feda2ca2d 100644 (file)
--- 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_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 757eec2553e597059c62d0251ba54dba3f01b497..1476bb8c190b2995734a721a27b4468773885e4f 100644 (file)
--- 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_common, inc_intel, inc_util,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_util,
   ],
   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 71f0d13a9a9cc81f8d3f6351ba2d2114645bae73..9e1f178a2bc0b9bbc86ca8a7f0ed0ba16695cfe1 100644 (file)
--- 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_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   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 647b77f5054df979c933e94229122f43b36ef187..675ee515c15b1dd7a09b8654eeb0fd9b23978606 100644 (file)
--- 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel],
+   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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 b8d2f1e9e8707915847d677dd94239d264724549..1cdcf03e45f3933560e2fafb2a464b643505750a 100644 (file)
--- 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_common, inc_compiler, inc_include, inc_intel, inc_vulkan_wsi,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_compiler, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+      inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_compiler, inc_vulkan_wsi,
+          inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_compiler, inc_vulkan_wsi,
         ],
       ),
       suite : ['intel'],

diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
index 50e652de125786f557733972bc43773b83ea2da6..2021344c638c5ae877892cbc321578d474cc85b5 100644 (file)
--- a/src/mesa/drivers/dri/common/meson.build
+++ b/src/mesa/drivers/dri/common/meson.build
@@ -23,7 +23,7 @@ inc_dri_common = include_directories('.')
 libdricommon = static_library(
   'dricommon',
   files('utils.c', 'utils.h', 'dri_util.c', 'dri_util.h'),
-  include_directories : [inc_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util],
   c_args : c_vis_args,
   dependencies : [dep_libdrm, idep_xmlconfig_headers],
   build_by_default : false,
@@ -32,7 +32,7 @@ libdricommon = static_library(
 libmegadriver_stub = static_library(
   'megadriver_stub',
   'megadriver_stub.c',
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : c_vis_args,
   dependencies : dep_libdrm,
   build_by_default : false,

diff --git a/src/mesa/drivers/dri/i915/meson.build b/src/mesa/drivers/dri/i915/meson.build
index 58eb698ac0f8d3dbb48f31a91703dfd64ba961d8..1c3f88c01f23d6d83a1f41bb0585871df400676d 100644 (file)
--- a/src/mesa/drivers/dri/i915/meson.build
+++ b/src/mesa/drivers/dri/i915/meson.build
@@ -87,7 +87,7 @@ files_i915 = files(
 libi915 = static_library(
   'i915',
   files_i915,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_intel, idep_xmlconfig_headers],

diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index a0c497ba3baae8e5bb76f161a33bb7c7aca28eaf..cf94548800b3b6cdd98f65a3aefd750eb20a4166 100644 (file)
--- 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_common, inc_intel, inc_dri_common],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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_common, inc_intel, inc_dri_common, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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],

diff --git a/src/mesa/drivers/dri/nouveau/meson.build b/src/mesa/drivers/dri/nouveau/meson.build
index 369493dfee133ad5b449856b46f487ababcde13b..39c580d159e8a6158885005e166f592102c1192b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/meson.build
+++ b/src/mesa/drivers/dri/nouveau/meson.build
@@ -82,7 +82,7 @@ files_nouveau_vieux = files(
 libnouveau_vieux = static_library(
   'nouveau_vieux',
   files_nouveau_vieux,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_xmlconfig_headers],

diff --git a/src/mesa/drivers/dri/r200/meson.build b/src/mesa/drivers/dri/r200/meson.build
index 7026129eb32abacad349209a1e8d10fbf9b5c001..9e3bea3afd257ea146a7d6bb42739587d4af8e32 100644 (file)
--- a/src/mesa/drivers/dri/r200/meson.build
+++ b/src/mesa/drivers/dri/r200/meson.build
@@ -80,7 +80,7 @@ libr200 = static_library(
   'r200',
   files_r200,
   include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
   ],
   c_args : [c_vis_args, '-DRADEON_R200'],
   cpp_args : [cpp_vis_args],

diff --git a/src/mesa/drivers/dri/radeon/meson.build b/src/mesa/drivers/dri/radeon/meson.build
index e79a5d00dbd1b2093403e491d41ae4a8dda271a9..4e6a375728cc05f8c1c7b492405c79e1f446e070 100644 (file)
--- a/src/mesa/drivers/dri/radeon/meson.build
+++ b/src/mesa/drivers/dri/radeon/meson.build
@@ -76,7 +76,7 @@ libr100 = static_library(
   'r100',
   files_r100,
   include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
   ],
   c_args : [c_vis_args, '-DRADEON_R100'],
   cpp_args : [cpp_vis_args],

diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build
index 35b30588ca704965707baec3b8782e44d2d65b41..e27606bae6e1d9d713c69084d1422717f24cd509 100644 (file)
--- a/src/mesa/drivers/dri/swrast/meson.build
+++ b/src/mesa/drivers/dri/swrast/meson.build
@@ -22,6 +22,6 @@ libswrast_dri = static_library(
   'swrast_dri',
   files('swrast.c', 'swrast_priv.h'),
   c_args : [c_vis_args],
-  include_directories : [inc_common, inc_dri_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common],
   dependencies : dep_libdrm,
 )

diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 5c2ca120333761f84d586b52671e1cbf5b1a805b..ba594258363e037095d7131041bd051669b417c7 100644 (file)
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -705,7 +705,7 @@ if with_sse41
     'mesa_sse41',
     files('main/streaming-load-memcpy.c', 'main/sse_minmax.c'),
     c_args : [c_vis_args, c_msvc_compat_args, sse41_args],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   )
 else
   libmesa_sse41 = []
@@ -728,7 +728,7 @@ libmesa_common = static_library(
   files_libmesa_common,
   c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
   dependencies : idep_nir_headers,
   build_by_default : false,
 )
@@ -738,7 +738,7 @@ libmesa_classic = static_library(
   files_libmesa_classic,
   c_args : [c_vis_args, c_msvc_compat_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
   link_with : [libmesa_common, libglsl, libmesa_sse41],
   dependencies : idep_nir_headers,
   build_by_default : false,
@@ -749,7 +749,7 @@ libmesa_gallium = static_library(
   files_libmesa_gallium,
   c_args : [c_vis_args, c_msvc_compat_args, _mesa_windows_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _mesa_windows_args],
-  include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_libmesa_asm, include_directories('main')],
   link_with : [libmesa_common, libglsl, libmesa_sse41],
   dependencies : [idep_nir_headers, dep_vdpau],
   build_by_default : false,

diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build
index 5ef884cb1ceb14379592981325936349f30959ea..397c6b7d0d5bf97dfd0d67cf64641dc47f177cf3 100644 (file)
--- a/src/mesa/state_tracker/tests/meson.build
+++ b/src/mesa/state_tracker/tests/meson.build
@@ -21,7 +21,7 @@
 libmesa_st_test_common = static_library(
   'mesa_st_test_common',
   ['st_tests_common.cpp', ir_expression_operation_h],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : idep_gtest,
 )
 
@@ -30,7 +30,7 @@ test(
   executable(
     'st_format_test',
     ['st_format.c'],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
     ],
@@ -44,7 +44,7 @@ test(
   executable(
     'st_renumerate_test',
     ['test_glsl_to_tgsi_lifetime.cpp', ir_expression_operation_h],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
     ],
@@ -58,7 +58,7 @@ test(
   executable(
     'st_array_merge_test',
     ['test_glsl_to_tgsi_array_merge.cpp', ir_expression_operation_h],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     link_with : [
       libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
     ],

diff --git a/src/meson.build b/src/meson.build
index 992a97399301f60b2f6eb17a61d6f34039ae7001..cf0c34c9560e76525fb944476caa6916ab879b08 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,7 +25,6 @@ inc_gallium = include_directories('gallium/include')
 inc_gallium_aux = include_directories('gallium/auxiliary')
 inc_amd_common = include_directories('amd/common')
 inc_amd_common_llvm = include_directories('amd/llvm')
-inc_common = [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
 
 libglsl_util = static_library(
   'glsl_util',
@@ -34,7 +33,7 @@ libglsl_util = static_library(
     'mesa/program/prog_parameter.c', 'mesa/program/symbol_table.c',
     'mesa/program/dummy_errors.c',
   ),
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args],
   build_by_default : false,
 )

diff --git a/src/panfrost/bifrost/meson.build b/src/panfrost/bifrost/meson.build
index 90a0d3dcfb1ab07cc39b2ca75133f2cd8898c38a..8864951a638db52fd1dd2d94b19933cfc2773893 100644 (file)
--- a/src/panfrost/bifrost/meson.build
+++ b/src/panfrost/bifrost/meson.build
@@ -48,7 +48,7 @@ bifrost_nir_algebraic_c = custom_target(
 libpanfrost_bifrost = static_library(
   'panfrost_bifrost',
   [libpanfrost_bifrost_files, bifrost_nir_algebraic_c],
-  include_directories : [inc_common, inc_include, inc_src, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
   dependencies: [idep_nir],
   link_with: [libpanfrost_util],
   c_args : [c_vis_args, no_override_init_args],

diff --git a/src/panfrost/encoder/meson.build b/src/panfrost/encoder/meson.build
index 6a82fb30b96be822b2900c6afd6396cc4f0b5077..babf52916ae9b1d1812df53736792bb3f520dc4b 100644 (file)
--- a/src/panfrost/encoder/meson.build
+++ b/src/panfrost/encoder/meson.build
@@ -36,7 +36,7 @@ libpanfrost_encoder_files = files(
 libpanfrost_encoder = static_library(
   'panfrost_encoder',
   [libpanfrost_encoder_files],
-  include_directories : [inc_common, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies: [dep_libdrm],

diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 6ea0739b112a0690d335b1c5e6ea2b4c7845bdc8..41a5ade5725a4d3f5e8aa907e233532806ac9c36 100644 (file)
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -42,7 +42,10 @@ bifrost_compiler = executable(
   'bifrost_compiler',
   [files_bifrost],
   include_directories : [
-    inc_common,
+    inc_mapi,
+    inc_mesa,
+    inc_gallium,
+    inc_gallium_aux,
     inc_include,
     inc_src,
     inc_panfrost,

diff --git a/src/panfrost/midgard/meson.build b/src/panfrost/midgard/meson.build
index 8b93b4fa128ee2f48381dd81db055fee972ddbb5..fc0cd85f4df968e67949d0d3010b20de72c3c90a 100644 (file)
--- a/src/panfrost/midgard/meson.build
+++ b/src/panfrost/midgard/meson.build
@@ -59,7 +59,10 @@ libpanfrost_midgard = static_library(
   'panfrost_midgard',
   [libpanfrost_midgard_files, midgard_nir_algebraic_c],
   include_directories : [
-   inc_common,
+   inc_mapi,
+   inc_mesa,
+   inc_gallium,
+   inc_gallium_aux,
    inc_include,
    inc_src,
    inc_panfrost_hw,

diff --git a/src/panfrost/pandecode/meson.build b/src/panfrost/pandecode/meson.build
index 2c341a58cc47360d9f8db2727ac6acd5256d824c..1add7d53c504c1e79dd5f89fee466079bf8517b7 100644 (file)
--- a/src/panfrost/pandecode/meson.build
+++ b/src/panfrost/pandecode/meson.build
@@ -28,7 +28,7 @@ libpanfrost_decode_files = files(
 libpanfrost_decode = static_library(
   'panfrost_decode',
   [libpanfrost_decode_files],
-  include_directories : [inc_common, inc_panfrost],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   build_by_default : false,

diff --git a/src/panfrost/shared/meson.build b/src/panfrost/shared/meson.build
index 7f5f398c59423cb87994f802bed15396ccd533cc..0a342e39701960f128e7fd5ed803b065e7b23b2d 100644 (file)
--- a/src/panfrost/shared/meson.build
+++ b/src/panfrost/shared/meson.build
@@ -30,7 +30,7 @@ libpanfrost_shared_files = files(
 libpanfrost_shared = static_library(
   'panfrost_shared',
   [libpanfrost_shared_files],
-  include_directories : [inc_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args, no_override_init_args, '-O3'],
   cpp_args : [cpp_vis_args],
   build_by_default : false,

diff --git a/src/panfrost/util/meson.build b/src/panfrost/util/meson.build
index a39ad5130bbb5da15bfb3e95e3ef8c77f928101f..dfc4b3fc6d3685b6fa7b1d79df77975dca507a69 100644 (file)
--- a/src/panfrost/util/meson.build
+++ b/src/panfrost/util/meson.build
@@ -31,7 +31,7 @@ libpanfrost_util_files = files(
 libpanfrost_util = static_library(
   'panfrost_util',
   [libpanfrost_util_files],
-  include_directories : [inc_common, inc_panfrost_hw],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
   dependencies: [idep_nir],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],

diff --git a/src/util/format/meson.build b/src/util/format/meson.build
index b5e75e441ae19a1742b22746d8bf7fa88b3dfadd..4d60e6ed80e2e0b34b1cfbacf3a5e46abf25605f 100644 (file)
--- a/src/util/format/meson.build
+++ b/src/util/format/meson.build
@@ -43,7 +43,7 @@ u_format_table_c = custom_target(
 libmesa_format = static_library(
   'mesa_format',
   [files_mesa_format, u_format_table_c],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : dep_m,
   c_args : [c_msvc_compat_args, c_vis_args],
   build_by_default : false

diff --git a/src/util/meson.build b/src/util/meson.build
index d6647c0c5c38d3ccb6809ed5bea2d9a579b78d69..0a2b2e4284e9a44ca14dbd58730a81e046f43c2b 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -170,7 +170,7 @@ endif
 _libmesa_util = static_library(
   'mesa_util',
   [files_mesa_util, format_srgb],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : deps_for_libmesa_util,
   link_with: libmesa_format,
   c_args : [c_msvc_compat_args, c_vis_args],
@@ -186,7 +186,7 @@ idep_mesautil = declare_dependency(
 _libxmlconfig = static_library(
   'xmlconfig',
   files_xmlconfig,
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [idep_mesautil, dep_expat, dep_m],
   c_args : [
     c_msvc_compat_args, c_vis_args,
@@ -211,7 +211,7 @@ if with_tests
     executable(
       'u_atomic_test',
       files('u_atomic_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : idep_mesautil,
       c_args : [c_msvc_compat_args],
     ),
@@ -223,7 +223,7 @@ if with_tests
     executable(
       'blob_test',
       files('blob_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : idep_mesautil,
       c_args : [c_msvc_compat_args],
     ),
@@ -235,7 +235,7 @@ if with_tests
     executable(
       'rb_tree_test',
       files('rb_tree_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : idep_mesautil,
       c_args : [c_msvc_compat_args],
     ),
@@ -247,7 +247,7 @@ if with_tests
     executable(
       'roundeven_test',
       files('roundeven_test.c'),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       c_args : [c_msvc_compat_args],
       dependencies : [dep_m],
     ),
@@ -262,7 +262,7 @@ if with_tests
       executable(
         'mesa-sha1_test',
         files('mesa-sha1_test.c'),
-        include_directories : inc_common,
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
         link_with : _libmesa_util,
         c_args : [c_msvc_compat_args],
       ),
@@ -275,7 +275,7 @@ if with_tests
     executable(
        'bitset_test',
        files('bitset_test.cpp'),
-       include_directories : inc_common,
+       include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
        dependencies : [idep_mesautil, idep_gtest],
      ),
      suite : ['util'],
@@ -284,7 +284,7 @@ if with_tests
   process_test_exe = executable(
     'process_test',
     files('process_test.c'),
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
     dependencies : idep_mesautil,
     c_args : [c_msvc_compat_args],
   )

diff --git a/src/util/tests/fast_idiv_by_const/meson.build b/src/util/tests/fast_idiv_by_const/meson.build
index 00b24678b753799cc2484e640d5d7a9a2edc8127..9c8c03d974e1bf065e2ad45145f616b7acf5f002 100644 (file)
--- a/src/util/tests/fast_idiv_by_const/meson.build
+++ b/src/util/tests/fast_idiv_by_const/meson.build
@@ -24,7 +24,7 @@ test(
     'fast_idiv_by_const_test',
     'fast_idiv_by_const_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
   timeout: 60,

diff --git a/src/util/tests/fast_urem_by_const/meson.build b/src/util/tests/fast_urem_by_const/meson.build
index a16407d5ea6c57dd61749af260bc3ccd1d56a43e..079309745519285f072d62313725309ec3e079c6 100644 (file)
--- a/src/util/tests/fast_urem_by_const/meson.build
+++ b/src/util/tests/fast_urem_by_const/meson.build
@@ -25,7 +25,7 @@ test(
     'fast_urem_by_const_test',
     'fast_urem_by_const_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )

diff --git a/src/util/tests/format/meson.build b/src/util/tests/format/meson.build
index 6f4b91cf810441132330b565d0e75da8719be5b4..761ce49abe7015930827316a2cce9be5a897bbe6 100644 (file)
--- a/src/util/tests/format/meson.build
+++ b/src/util/tests/format/meson.build
@@ -3,7 +3,7 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
     executable(
       t,
       '@0@.c'.format(t),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : idep_mesautil,
     ),
     suite : 'format',

diff --git a/src/util/tests/set/meson.build b/src/util/tests/set/meson.build
index 9d0d311ba5ef64e793e3a69c80160ae203e2301b..e9b00629b44eb71ae067238ad4cebddb03b97105 100644 (file)
--- a/src/util/tests/set/meson.build
+++ b/src/util/tests/set/meson.build
@@ -24,7 +24,7 @@ test(
     'set_test',
     'set_test.cpp',
     dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )

diff --git a/src/util/tests/sparse_array/meson.build b/src/util/tests/sparse_array/meson.build
index 7c86efea29dddf81401788e5d1387dc0ccb2bb03..9afb49301fbc45a6350b8f0d18ed6a3b915d88d0 100644 (file)
--- a/src/util/tests/sparse_array/meson.build
+++ b/src/util/tests/sparse_array/meson.build
@@ -24,7 +24,7 @@ test(
     'multi_threaded',
     'multi_threaded.c',
     dependencies : [idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
   timeout: 60,

diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build
index b3eb2714a36f1687335055ba2581c682fbfc837e..acb6abca4753bd2794f75f511fe89038e88251b3 100644 (file)
--- a/src/util/tests/string_buffer/meson.build
+++ b/src/util/tests/string_buffer/meson.build
@@ -25,7 +25,7 @@ test(
     'string_buffer_test.cpp',
     cpp_args : [cpp_msvc_compat_args],
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )

diff --git a/src/util/tests/timespec/meson.build b/src/util/tests/timespec/meson.build
index c685db5fd998e76db6ca178697be5f3337e75ba9..2fc737a7db447c065902044aa8d6057b2c738906 100644 (file)
--- a/src/util/tests/timespec/meson.build
+++ b/src/util/tests/timespec/meson.build
@@ -24,7 +24,7 @@ test(
     'timespec_test',
     'timespec_test.cpp',
     dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )

diff --git a/src/util/tests/vector/meson.build b/src/util/tests/vector/meson.build
index d05abc6338ba7c8c344386eeb130806130eab308..40ad93995a4923b83bb022efdfdd208751778505 100644 (file)
--- a/src/util/tests/vector/meson.build
+++ b/src/util/tests/vector/meson.build
@@ -24,7 +24,7 @@ test(
     'vector_test',
     'vector_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )

diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
index 5b553d0b51ed097d3fa5edc6236ca96c05eb337e..99a823a58c8ef174d35bf1f4574c7f05087b584d 100644 (file)
--- a/src/vulkan/overlay-layer/meson.build
+++ b/src/vulkan/overlay-layer/meson.build
@@ -42,7 +42,7 @@ vklayer_mesa_overlay = shared_library(
   c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
   cpp_args : [cpp_vis_args, vulkan_wsi_args],
   dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']),
   install : true
 )

diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index f4f7d1730e3941d20d031b97ae5a7cddd769b585..77e0810bc0572bede9036264290411f94082a3f6 100644 (file)
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -40,7 +40,7 @@ vk_enum_to_str = custom_target(
 libvulkan_util = static_library(
   'vulkan_util',
   [files_vulkan_util, vk_enum_to_str],
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : vulkan_wsi_deps,
   c_args : [c_vis_args, vulkan_wsi_args],
   build_by_default : false,

diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index 6cf9a04f3b4f7928a592eb7b351677c93fddebf6..d243a673d7ad3da10305a70e63373b5c817876fe 100644 (file)
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -41,7 +41,7 @@ endif
 libvulkan_wsi = static_library(
   'vulkan_wsi',
   files_vulkan_wsi,
-  include_directories : [inc_common, inc_include],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies : [vulkan_wsi_deps, dep_libdrm, idep_vulkan_util, idep_xmlconfig],
   c_args : [c_vis_args, vulkan_wsi_args],
   build_by_default : false,