meson: inline `inc_common`

[mesa.git] / src / compiler / nir / meson.build

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'],